← 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-24 02:22:06 UTC
  • mto: (389.2.2 pep8-2009-10)
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: mnordhoff@mattnordhoff.com-20090424022206-7i2gvg3wp98fzy9q
Remove an extra \n at the end of a file

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(path, config)
 
69
        app = UserBranchesFromFileSystemRoot(
 
70
            path, config.get_option('trunk_dir'))
70
71
    else:
71
 
        app = BranchesFromFileSystemRoot(path, config)
 
72
        app = BranchesFromFileSystemRoot(path)
72
73
 
73
74
    # setup_logging()
74
75
    logging.basicConfig()
86
87
    logfile.setLevel(logging.DEBUG)
87
88
    logger.addHandler(logfile)
88
89
 
 
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
 
89
95
    # setup_logging() #end
90
96
 
91
97
    app = TransLogger(app, logger=logger)
93
99
        from loggerhead.middleware.profile import LSProfMiddleware
94
100
        app = LSProfMiddleware(app)
95
101
    if config.get_option('memory_profile'):
96
 
        from dozer import Dozer
97
 
        app = Dozer(app)
 
102
        from loggerhead.middleware.profile import MemoryProfileMiddleware
 
103
        app = MemoryProfileMiddleware(app)
98
104
 
99
105
    if not config.get_option('user_prefix'):
100
106
        prefix = '/'