← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Matt Nordhoff
  • Date: 2009-06-17 22:33:55 UTC
  • mfrom: (366 trunk)
  • mto: This revision was merged to the branch mainline in revision 367.
  • Revision ID: mnordhoff@mattnordhoff.com-20090617223355-i0bwf75e5o87kxr8
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
95
95
 
96
96
    # setup_logging() #end
97
97
 
98
 
    app = TransLogger(app, logger=logger)
99
98
    if config.get_option('profile'):
100
99
        from loggerhead.middleware.profile import LSProfMiddleware
101
100
        app = LSProfMiddleware(app)
130
129
 
131
130
    app = HTTPExceptionHandler(app)
132
131
    app = ErrorHandlerApp(app)
 
132
    app = TransLogger(app, logger=logger)
133
133
 
134
134
    if not config.get_option('user_port'):
135
135
        port = '8080'