~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Guillermo Gonzalez
  • Date: 2008-09-26 12:48:00 UTC
  • mfrom: (217.2.2 logging)
  • mto: This revision was merged to the branch mainline in revision 226.
  • Revision ID: guillo.gonzo@gmail.com-20080926124800-7pjmc08s1da0cxg8
 merge with mwhudson logging branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
52
52
    parser.add_option("--reload", action="store_true", dest="reload",
53
53
                      help="Restarts the application when changing python"
54
54
                           " files. Only used for development purposes.")
55
 
    parser.add_option('--log-folder', dest="log_folder", 
56
 
                      type=str, help="The directory to place log files")
 
55
    parser.add_option('--log-folder', dest="log_folder",
 
56
                      type=str, help="The directory to place log files in.")
57
57
    parser.add_option("--version", action="store_true", dest="show_version",
58
58
                      help="Print the software version and exit")
59
59
    return parser
82
82
    if options.trunk_dir and not options.user_dirs:
83
83
        print "--trunk-dir is only valid with --user-dirs"
84
84
        sys.exit(1)
85
 
        
 
85
 
86
86
    if options.reload:
87
87
        if Reloader.is_installed():
88
88
            Reloader.install()
96
96
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
97
97
    else:
98
98
        app = BranchesFromFileSystemRoot(path)
99
 
    
 
99
 
100
100
    # setup_logging()
101
101
    logging.basicConfig()
102
102
    logging.getLogger('').setLevel(logging.DEBUG)
127
127
        pass
128
128
    else:
129
129
        app = PrefixMiddleware(app, prefix=prefix)
130
 
    
 
130
 
131
131
    if not options.user_port:
132
132
        port = '8080'
133
133
    else: