← 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-04-30 10:27:43 UTC
  • mfrom: (334 trunk)
  • mto: (389.2.2 pep8-2009-10)
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: mnordhoff@mattnordhoff.com-20090430102743-76rqdslvx4f8y1up
Merge trunk, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
66
66
        if not config.get_option('trunk_dir'):
67
67
            print "You didn't specify a directory for the trunk directories."
68
68
            sys.exit(1)
69
 
        app = UserBranchesFromFileSystemRoot(
70
 
            path, config.get_option('trunk_dir'))
 
69
        app = UserBranchesFromFileSystemRoot(path, config)
71
70
    else:
72
 
        app = BranchesFromFileSystemRoot(path)
 
71
        app = BranchesFromFileSystemRoot(path, config)
73
72
 
74
73
    # setup_logging()
75
74
    logging.basicConfig()
87
86
    logfile.setLevel(logging.DEBUG)
88
87
    logger.addHandler(logfile)
89
88
 
90
 
    if config.get_option('memory_profile'):
91
 
        memprofile = logging.getLogger('loggerhead-memprofile')
92
 
        memprofile.setLevel(logging.DEBUG)
93
 
        memprofile.addHandler(logging.FileHandler('loggerhead-memprofile'))
94
 
 
95
89
    # setup_logging() #end
96
90
 
97
91
    app = TransLogger(app, logger=logger)
99
93
        from loggerhead.middleware.profile import LSProfMiddleware
100
94
        app = LSProfMiddleware(app)
101
95
    if config.get_option('memory_profile'):
102
 
        from loggerhead.middleware.profile import MemoryProfileMiddleware
103
 
        app = MemoryProfileMiddleware(app)
 
96
        from dozer import Dozer
 
97
        app = Dozer(app)
104
98
 
105
99
    if not config.get_option('user_prefix'):
106
100
        prefix = '/'