← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Michael Hudson
  • Date: 2009-04-23 23:37:10 UTC
  • mfrom: (327.1.1 one-config)
  • Revision ID: michael.hudson@canonical.com-20090423233710-9ollsj79xebarsxw
merge Matt's one-config branch, which starts to use a single object for configuration

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
86
86
    logfile.setLevel(logging.DEBUG)
87
87
    logger.addHandler(logfile)
88
88
 
 
89
    if config.get_option('memory_profile'):
 
90
        memprofile = logging.getLogger('loggerhead-memprofile')
 
91
        memprofile.setLevel(logging.DEBUG)
 
92
        memprofile.addHandler(logging.FileHandler('loggerhead-memprofile'))
 
93
 
89
94
    # setup_logging() #end
90
95
 
91
96
    app = TransLogger(app, logger=logger)
93
98
        from loggerhead.middleware.profile import LSProfMiddleware
94
99
        app = LSProfMiddleware(app)
95
100
    if config.get_option('memory_profile'):
96
 
        from dozer import Dozer
97
 
        app = Dozer(app)
 
101
        from loggerhead.middleware.profile import MemoryProfileMiddleware
 
102
        app = MemoryProfileMiddleware(app)
98
103
 
99
104
    if not config.get_option('user_prefix'):
100
105
        prefix = '/'