← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Martin Albisetti
  • Date: 2009-06-08 23:02:49 UTC
  • mfrom: (352.6.13 serve-config)
  • Revision ID: martin.albisetti@canonical.com-20090608230249-8a05ifphj4zluly2
Allow hiding branches with serve-branches, now checks in ~/.bazaar/locations.conf

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
 
1
#!/usr/bin/env python
1
2
#
2
3
# Copyright (C) 2008, 2009 Canonical Ltd
3
4
#
22
23
import sys
23
24
 
24
25
from bzrlib.plugin import load_plugins
 
26
from bzrlib.transport import get_transport
25
27
 
26
28
from paste import httpserver
27
29
from paste.httpexceptions import HTTPExceptionHandler, HTTPInternalServerError
35
37
from loggerhead.apps.error import ErrorHandlerApp
36
38
 
37
39
 
38
 
def get_config_and_path(args):
39
 
    config = LoggerheadConfig(args)
 
40
def main(args):
 
41
    config = LoggerheadConfig()
40
42
 
41
43
    if config.get_option('show_version'):
42
 
        print "loggerhead %s" % (__version__,)
 
44
        print "loggerhead %s" % __version__
43
45
        sys.exit(0)
44
46
 
45
47
    if config.arg_count > 1:
46
48
        config.print_help()
47
49
        sys.exit(1)
48
50
    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):
 
51
        path = config.get_arg(0)
 
52
    else:
 
53
        path = '.'
 
54
 
 
55
    load_plugins()
 
56
 
 
57
    if config.get_option('allow_writes'):
 
58
        transport = get_transport(path)
 
59
    else:
 
60
        transport = get_transport('readonly+' + path)
 
61
 
96
62
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
97
63
        print "--trunk-dir is only valid with --user-dirs"
98
64
        sys.exit(1)
107
73
        if not config.get_option('trunk_dir'):
108
74
            print "You didn't specify a directory for the trunk directories."
109
75
            sys.exit(1)
110
 
        app = UserBranchesFromTransportRoot(base, config)
111
 
    else:
112
 
        app = BranchesFromTransportRoot(base, config)
113
 
 
114
 
    setup_logging(config)
 
76
        app = UserBranchesFromTransportRoot(transport, config)
 
77
    else:
 
78
        app = BranchesFromTransportRoot(transport, config)
 
79
 
 
80
    # setup_logging()
 
81
    logging.basicConfig()
 
82
    logging.getLogger('').setLevel(logging.DEBUG)
 
83
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
 
84
    if config.get_option('log_folder'):
 
85
        logfile_path = os.path.join(
 
86
            config.get_option('log_folder'), 'serve-branches.log')
 
87
    else:
 
88
        logfile_path = 'serve-branches.log'
 
89
    logfile = logging.FileHandler(logfile_path, 'a')
 
90
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
 
91
                                  ' %(message)s')
 
92
    logfile.setFormatter(formatter)
 
93
    logfile.setLevel(logging.DEBUG)
 
94
    logger.addHandler(logfile)
 
95
 
 
96
    # setup_logging() #end
115
97
 
116
98
    if config.get_option('profile'):
117
99
        from loggerhead.middleware.profile import LSProfMiddleware
147
129
 
148
130
    app = HTTPExceptionHandler(app)
149
131
    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)
 
132
    app = TransLogger(app, logger=logger)
161
133
 
162
134
    if not config.get_option('user_port'):
163
135
        port = '8080'
169
141
    else:
170
142
        host = config.get_option('user_host')
171
143
 
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()
 
144
    httpserver.serve(app, host=host, port=port)
 
145
 
 
146
 
 
147
if __name__ == "__main__":
 
148
    main(sys.argv)