← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Jelmer Vernooij
  • Date: 2008-08-06 18:33:20 UTC
  • mto: (197.1.9 pathargs)
  • mto: This revision was merged to the branch mainline in revision 202.
  • Revision ID: jelmer@samba.org-20080806183320-6llann0k480dlb9y
add --log-folder option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
28
28
from loggerhead import __version__
29
29
from loggerhead.apps.filesystem import (
30
30
    BranchesFromFileSystemRoot, UserBranchesFromFileSystemRoot)
31
 
from loggerhead.apps.error import ErrorHandlerApp
 
31
 
32
32
 
33
33
def command_line_parser():
34
34
    parser = OptionParser("%prog [options] <path>")
35
35
    parser.set_defaults(
36
36
        user_dirs=False,
37
37
        show_version=False,
38
 
        log_folder=None,
39
38
        )
40
39
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
41
40
                      help="Serve user directories as ~user.")
42
41
    parser.add_option("--trunk-dir", metavar="DIR",
43
42
                      help="The directory that contains the trunk branches.")
44
 
    parser.add_option("--port", dest="user_port",
45
 
                      help="Port Loggerhead should listen on (defaults to 8080).")
46
 
    parser.add_option("--host", dest="user_host",
47
 
                      help="Host Loggerhead should listen on.")
48
 
    parser.add_option("--prefix", dest="user_prefix",
49
 
                      help="Specify host prefix.")
50
43
    parser.add_option("--version", action="store_true", dest="show_version",
51
44
                      help="Print the software version and exit")
52
 
    parser.add_option('--log-folder', dest="log_folder", 
53
 
                      type=str, help="The directory to place log files")
54
45
    return parser
55
46
 
56
47
 
57
48
def main(args):
 
49
    logging.basicConfig()
 
50
    logging.getLogger().setLevel(logging.DEBUG)
 
51
 
58
52
    parser = command_line_parser()
59
53
    (options, args) = parser.parse_args(sys.argv[1:])
60
54
 
85
79
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
86
80
    else:
87
81
        app = BranchesFromFileSystemRoot(path)
88
 
    
89
 
    # setup_logging()
90
 
    logging.basicConfig()
91
 
    logging.getLogger('').setLevel(logging.DEBUG)
92
 
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
93
 
    if options.log_folder:
94
 
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
95
 
    else:
96
 
        logfile_path = 'serve-branches.log'
97
 
    logfile = logging.FileHandler(logfile_path, 'a')
98
 
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
99
 
                                  ' %(message)s')
100
 
    logfile.setFormatter(formatter)
101
 
    logfile.setLevel(logging.DEBUG)
102
 
    logger.addHandler(logfile)
103
 
    # setup_logging() #end
104
 
    app = ErrorHandlerApp(app)
105
82
    app = HTTPExceptionHandler(app)
106
 
    app = TransLogger(app, logger=logger)
107
 
 
108
 
 
109
 
    if not options.user_prefix:
110
 
        prefix = '/'
111
 
    else:
112
 
        prefix = options.user_prefix
 
83
    app = TransLogger(app)
113
84
 
114
85
    try:
115
86
        from paste.deploy.config import PrefixMiddleware
116
87
    except ImportError:
117
88
        pass
118
89
    else:
119
 
        app = PrefixMiddleware(app, prefix=prefix)
120
 
    
121
 
    if not options.user_port:
122
 
        port = '8080'
123
 
    else:
124
 
        port = options.user_port
125
 
 
126
 
    if not options.user_host:
127
 
        host = '0.0.0.0'
128
 
    else:
129
 
        host = options.user_host
130
 
 
131
 
    httpserver.serve(app, host=host, port=port)
 
90
        app = PrefixMiddleware(app)
 
91
 
 
92
    httpserver.serve(app, host='0.0.0.0', port='8080')
132
93
 
133
94
 
134
95
if __name__ == "__main__":