← 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-05-06 18:05:41 UTC
  • mto: This revision was merged to the branch mainline in revision 341.
  • Revision ID: mnordhoff@mattnordhoff.com-20090506180541-84f3nodl1wnarucn
More.

I'm now done going through the logs post-1.10, but there are other things that should be added.

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
1
 
#
2
 
# Copyright (C) 2008, 2009 Canonical Ltd
3
 
#
 
1
#!/usr/bin/env python
4
2
# This program is free software; you can redistribute it and/or modify
5
3
# it under the terms of the GNU General Public License as published by
6
4
# the Free Software Foundation; either version 2 of the License, or
22
20
import sys
23
21
 
24
22
from bzrlib.plugin import load_plugins
 
23
from bzrlib.transport import get_transport
25
24
 
26
25
from paste import httpserver
27
26
from paste.httpexceptions import HTTPExceptionHandler, HTTPInternalServerError
35
34
from loggerhead.apps.error import ErrorHandlerApp
36
35
 
37
36
 
38
 
def get_config_and_path(args):
39
 
    config = LoggerheadConfig(args)
 
37
def main(args):
 
38
    config = LoggerheadConfig()
40
39
 
41
40
    if config.get_option('show_version'):
42
 
        print "loggerhead %s" % (__version__,)
 
41
        print "loggerhead %s" % __version__
43
42
        sys.exit(0)
44
43
 
45
44
    if config.arg_count > 1:
46
45
        config.print_help()
47
46
        sys.exit(1)
48
47
    elif config.arg_count == 1:
49
 
        base = config.get_arg(0)
50
 
    else:
51
 
        base = '.'
52
 
 
53
 
    if not config.get_option('allow_writes'):
54
 
        base = 'readonly+' + base
55
 
 
56
 
    return config, base
57
 
 
58
 
 
59
 
def setup_logging(config, init_logging=True, log_file=None):
60
 
    log_level = config.get_log_level()
61
 
    if init_logging:
62
 
        logging.basicConfig()
63
 
        if log_level is not None:
64
 
            logging.getLogger('').setLevel(log_level)
65
 
    logger = logging.getLogger('loggerhead')
66
 
    if log_level is not None:
67
 
        logger.setLevel(log_level)
68
 
    if log_file is not None:
69
 
        handler = logging.StreamHandler(log_file)
70
 
    else:
71
 
        if config.get_option('log_folder'):
72
 
            logfile_path = os.path.join(
73
 
                config.get_option('log_folder'), 'serve-branches.log')
74
 
        else:
75
 
            logfile_path = 'serve-branches.log'
76
 
        handler = logging.FileHandler(logfile_path, 'a')
77
 
        formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
78
 
                                      ' %(message)s')
79
 
        handler.setFormatter(formatter)
80
 
    # We set the handler to accept all messages, the *logger* won't emit them
81
 
    # if it is configured to suppress it
82
 
    handler.setLevel(logging.DEBUG)
83
 
    logger.addHandler(handler)
84
 
    def _restrict_logging(logger_name):
85
 
        logger = logging.getLogger(logger_name)
86
 
        if logger.getEffectiveLevel() < logging.INFO:
87
 
            logger.setLevel(logging.INFO)
88
 
    # simpleTAL is *very* verbose in DEBUG mode, which is otherwise the
89
 
    # default. So quiet it up a bit.
90
 
    _restrict_logging('simpleTAL')
91
 
    _restrict_logging('simpleTALES')
92
 
    return logger
93
 
 
94
 
 
95
 
def make_app_for_config_and_path(config, base):
 
48
        path = config.get_arg(0)
 
49
    else:
 
50
        path = '.'
 
51
 
 
52
    load_plugins()
 
53
 
 
54
    transport = get_transport(path)
 
55
 
96
56
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
97
57
        print "--trunk-dir is only valid with --user-dirs"
98
58
        sys.exit(1)
107
67
        if not config.get_option('trunk_dir'):
108
68
            print "You didn't specify a directory for the trunk directories."
109
69
            sys.exit(1)
110
 
        app = UserBranchesFromTransportRoot(base, config)
111
 
    else:
112
 
        app = BranchesFromTransportRoot(base, config)
113
 
 
114
 
    setup_logging(config)
115
 
 
 
70
        app = UserBranchesFromTransportRoot(transport, config)
 
71
    else:
 
72
        app = BranchesFromTransportRoot(transport, config)
 
73
 
 
74
    # setup_logging()
 
75
    logging.basicConfig()
 
76
    logging.getLogger('').setLevel(logging.DEBUG)
 
77
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
 
78
    if config.get_option('log_folder'):
 
79
        logfile_path = os.path.join(
 
80
            config.get_option('log_folder'), 'serve-branches.log')
 
81
    else:
 
82
        logfile_path = 'serve-branches.log'
 
83
    logfile = logging.FileHandler(logfile_path, 'a')
 
84
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
 
85
                                  ' %(message)s')
 
86
    logfile.setFormatter(formatter)
 
87
    logfile.setLevel(logging.DEBUG)
 
88
    logger.addHandler(logfile)
 
89
 
 
90
    # setup_logging() #end
 
91
 
 
92
    app = TransLogger(app, logger=logger)
116
93
    if config.get_option('profile'):
117
94
        from loggerhead.middleware.profile import LSProfMiddleware
118
95
        app = LSProfMiddleware(app)
147
124
 
148
125
    app = HTTPExceptionHandler(app)
149
126
    app = ErrorHandlerApp(app)
150
 
    app = TransLogger(app, logger=logging.getLogger('loggerhead'))
151
 
 
152
 
    return app
153
 
 
154
 
 
155
 
def main(args):
156
 
    load_plugins()
157
 
 
158
 
    config, path = get_config_and_path(args)
159
 
 
160
 
    app = make_app_for_config_and_path(config, path)
161
127
 
162
128
    if not config.get_option('user_port'):
163
129
        port = '8080'
169
135
    else:
170
136
        host = config.get_option('user_host')
171
137
 
172
 
    if not config.get_option('protocol'):
173
 
        protocol = 'http'
174
 
    else:
175
 
        protocol = config.get_option('protocol')
176
 
 
177
 
    if protocol == 'http':
178
 
        httpserver.serve(app, host=host, port=port)
179
 
    else:
180
 
        if protocol == 'fcgi':
181
 
            from flup.server.fcgi import WSGIServer
182
 
        elif protocol == 'scgi':
183
 
            from flup.server.scgi import WSGIServer
184
 
        elif protocol == 'ajp':
185
 
            from flup.server.ajp import WSGIServer
186
 
        else:
187
 
            print 'Unknown protocol: %s.' % (protocol)
188
 
            sys.exit(1)
189
 
        WSGIServer(app, bindAddress=(host, int(port))).run()
 
138
    httpserver.serve(app, host=host, port=port)
 
139
 
 
140
 
 
141
if __name__ == "__main__":
 
142
    main(sys.argv)