← 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-24 00:00:14 UTC
  • mfrom: (331 trunk)
  • mto: This revision was merged to the branch mainline in revision 332.
  • Revision ID: michael.hudson@canonical.com-20090424000014-jyarzc0en7eyoj9q
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
63
63
            return Reloader.restart_with_reloader()
64
64
 
65
65
    if config.get_option('user_dirs'):
66
 
        if not config.get_option['trunk_dir']:
 
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()
77
76
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
78
77
    if config.get_option('log_folder'):
79
78
        logfile_path = os.path.join(
80
 
            config.get_option['log_folder'], 'serve-branches.log')
 
79
            config.get_option('log_folder'), 'serve-branches.log')
81
80
    else:
82
81
        logfile_path = 'serve-branches.log'
83
82
    logfile = logging.FileHandler(logfile_path, 'a')