~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

[rs=mwhudson] upgrade to loggerhead trunk again to get fix for file
        descriptor leak

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
 
94
89
    # setup_logging() #end
95
90
 
96
91
    app = TransLogger(app, logger=logger)
98
93
        from loggerhead.middleware.profile import LSProfMiddleware
99
94
        app = LSProfMiddleware(app)
100
95
    if config.get_option('memory_profile'):
101
 
        from loggerhead.middleware.profile import MemoryProfileMiddleware
102
 
        app = MemoryProfileMiddleware(app)
 
96
        from dozer import Dozer
 
97
        app = Dozer(app)
103
98
 
104
99
    if not config.get_option('user_prefix'):
105
100
        prefix = '/'