← 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-17 11:10:38 UTC
  • mto: (346.2.1 serve-directory)
  • mto: This revision was merged to the branch mainline in revision 350.
  • Revision ID: mnordhoff@mattnordhoff.com-20090517111038-26vo32le1dyp42lh
https://launchpad.net/bugs/377551
Fix 'bzr serve --http' (bug #377551).

I also added an optional 'argv' argument to LoggerheadConfig, defaulting to sys.argv[1:] like it used to do.

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):
 
48
        path = config.get_arg(0)
 
49
    else:
 
50
        path = '.'
 
51
 
 
52
    load_plugins()
 
53
 
 
54
    transport = get_transport(path)
 
55
 
 
56
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
 
57
        print "--trunk-dir is only valid with --user-dirs"
 
58
        sys.exit(1)
 
59
 
 
60
    if config.get_option('reload'):
 
61
        if Reloader.is_installed():
 
62
            Reloader.install()
 
63
        else:
 
64
            return Reloader.restart_with_reloader()
 
65
 
 
66
    if config.get_option('user_dirs'):
 
67
        if not config.get_option('trunk_dir'):
 
68
            print "You didn't specify a directory for the trunk directories."
 
69
            sys.exit(1)
 
70
        app = UserBranchesFromTransportRoot(transport, config)
 
71
    else:
 
72
        app = BranchesFromTransportRoot(transport, config)
 
73
 
 
74
    # setup_logging()
60
75
    logging.basicConfig()
61
76
    logging.getLogger('').setLevel(logging.DEBUG)
62
 
    logger = logging.getLogger('loggerhead')
 
77
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
63
78
    if config.get_option('log_folder'):
64
79
        logfile_path = os.path.join(
65
80
            config.get_option('log_folder'), 'serve-branches.log')
71
86
    logfile.setFormatter(formatter)
72
87
    logfile.setLevel(logging.DEBUG)
73
88
    logger.addHandler(logfile)
74
 
    return logger
75
 
 
76
 
 
77
 
def make_app_for_config_and_path(config, base):
78
 
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
79
 
        print "--trunk-dir is only valid with --user-dirs"
80
 
        sys.exit(1)
81
 
 
82
 
    if config.get_option('reload'):
83
 
        if Reloader.is_installed():
84
 
            Reloader.install()
85
 
        else:
86
 
            return Reloader.restart_with_reloader()
87
 
 
88
 
    if config.get_option('user_dirs'):
89
 
        if not config.get_option('trunk_dir'):
90
 
            print "You didn't specify a directory for the trunk directories."
91
 
            sys.exit(1)
92
 
        app = UserBranchesFromTransportRoot(base, config)
93
 
    else:
94
 
        app = BranchesFromTransportRoot(base, config)
95
 
 
96
 
    setup_logging(config)
97
 
 
 
89
 
 
90
    # setup_logging() #end
 
91
 
 
92
    app = TransLogger(app, logger=logger)
98
93
    if config.get_option('profile'):
99
94
        from loggerhead.middleware.profile import LSProfMiddleware
100
95
        app = LSProfMiddleware(app)
129
124
 
130
125
    app = HTTPExceptionHandler(app)
131
126
    app = ErrorHandlerApp(app)
132
 
    app = TransLogger(app, logger=logging.getLogger('loggerhead'))
133
 
 
134
 
    return app
135
 
 
136
 
 
137
 
def main(args):
138
 
    load_plugins()
139
 
 
140
 
    config, path = get_config_and_path(args)
141
 
 
142
 
    app = make_app_for_config_and_path(config, path)
143
127
 
144
128
    if not config.get_option('user_port'):
145
129
        port = '8080'
151
135
    else:
152
136
        host = config.get_option('user_host')
153
137
 
154
 
    if not config.get_option('protocol'):
155
 
        protocol = 'http'
156
 
    else:
157
 
        protocol = config.get_option('protocol')
158
 
 
159
 
    if protocol == 'http':
160
 
        httpserver.serve(app, host=host, port=port)
161
 
    else:
162
 
        if protocol == 'fcgi':
163
 
            from flup.server.fcgi import WSGIServer
164
 
        elif protocol == 'scgi':
165
 
            from flup.server.scgi import WSGIServer
166
 
        elif protocol == 'ajp':
167
 
            from flup.server.ajp import WSGIServer
168
 
        else:
169
 
            print 'Unknown protocol: %s.' % (protocol)
170
 
            sys.exit(1)
171
 
        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)