← 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: 2009-06-02 02:10:00 UTC
  • mto: (359.3.1 hpss-writes)
  • mto: This revision was merged to the branch mainline in revision 367.
  • Revision ID: jelmer@samba.org-20090602021000-8zgombmu7evrxaig
Cherrypick improvements from Matt. Keep smart server around.

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
19
19
import os
20
20
import sys
21
21
 
22
 
from optparse import OptionParser
 
22
from bzrlib.plugin import load_plugins
 
23
from bzrlib.transport import get_transport
23
24
 
24
25
from paste import httpserver
25
 
from paste.httpexceptions import HTTPExceptionHandler
 
26
from paste.httpexceptions import HTTPExceptionHandler, HTTPInternalServerError
26
27
from paste.translogger import TransLogger
27
28
 
28
29
from loggerhead import __version__
29
 
from loggerhead.apps.filesystem import (
30
 
    BranchesFromFileSystemRoot, UserBranchesFromFileSystemRoot)
31
 
 
32
 
 
33
 
def command_line_parser():
34
 
    parser = OptionParser("%prog [options] <path>")
35
 
    parser.set_defaults(
36
 
        user_dirs=False,
37
 
        show_version=False,
38
 
        )
39
 
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
40
 
                      help="Serve user directories as ~user.")
41
 
    parser.add_option("--trunk-dir", metavar="DIR",
42
 
                      help="The directory that contains the trunk branches.")
43
 
    parser.add_option("--port", dest="user_port",
44
 
                      help="Port Loggerhead should listen on. 8080 is the default one.")
45
 
    parser.add_option("--host", dest="user_host",
46
 
                      help="Host Loggerhead should listen on.")
47
 
    parser.add_option("--prefix", dest="user_prefix",
48
 
                      help="Specify host prefix.")
49
 
    parser.add_option("--version", action="store_true", dest="show_version",
50
 
                      help="Print the software version and exit")
51
 
    return parser
 
30
from loggerhead.apps.transport import (
 
31
    BranchesFromTransportRoot, UserBranchesFromTransportRoot)
 
32
from loggerhead.config import LoggerheadConfig
 
33
from loggerhead.util import Reloader
 
34
from loggerhead.apps.error import ErrorHandlerApp
52
35
 
53
36
 
54
37
def main(args):
55
 
    logging.basicConfig()
56
 
    logging.getLogger().setLevel(logging.DEBUG)
57
 
 
58
 
    parser = command_line_parser()
59
 
    (options, args) = parser.parse_args(sys.argv[1:])
60
 
 
61
 
    if options.show_version:
 
38
    config = LoggerheadConfig()
 
39
 
 
40
    if config.get_option('show_version'):
62
41
        print "loggerhead %s" % __version__
63
42
        sys.exit(0)
64
43
 
65
 
    if len(args) > 1:
66
 
        parser.print_help()
 
44
    if config.arg_count > 1:
 
45
        config.print_help()
67
46
        sys.exit(1)
68
 
    elif len(args) == 1:
69
 
        [path] = args
 
47
    elif config.arg_count == 1:
 
48
        path = config.get_arg(0)
70
49
    else:
71
50
        path = '.'
72
51
 
73
 
    if not os.path.isdir(path):
74
 
        print "%s is not a directory" % path
75
 
        sys.exit(1)
76
 
 
77
 
    if options.trunk_dir and not options.user_dirs:
 
52
    load_plugins()
 
53
 
 
54
    transport = get_transport(path)
 
55
 
 
56
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
78
57
        print "--trunk-dir is only valid with --user-dirs"
79
58
        sys.exit(1)
80
59
 
81
 
    if options.user_dirs:
82
 
        if not options.trunk_dir:
 
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'):
83
68
            print "You didn't specify a directory for the trunk directories."
84
69
            sys.exit(1)
85
 
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
86
 
    else:
87
 
        app = BranchesFromFileSystemRoot(path)
88
 
    app = HTTPExceptionHandler(app)
89
 
    app = TransLogger(app)
90
 
 
91
 
    if not options.user_prefix:
 
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)
 
93
    if config.get_option('profile'):
 
94
        from loggerhead.middleware.profile import LSProfMiddleware
 
95
        app = LSProfMiddleware(app)
 
96
    if config.get_option('memory_profile'):
 
97
        from dozer import Dozer
 
98
        app = Dozer(app)
 
99
 
 
100
    if not config.get_option('user_prefix'):
92
101
        prefix = '/'
93
102
    else:
94
 
        prefix = options.user_prefix
 
103
        prefix = config.get_option('user_prefix')
 
104
        if not prefix.startswith('/'):
 
105
            prefix = '/' + prefix
95
106
 
96
107
    try:
97
108
        from paste.deploy.config import PrefixMiddleware
98
109
    except ImportError:
99
 
        pass
 
110
        cant_proxy_correctly_message = (
 
111
            'Unsupported configuration: PasteDeploy not available, but '
 
112
            'loggerhead appears to be behind a proxy.')
 
113
        def check_not_proxied(app):
 
114
            def wrapped(environ, start_response):
 
115
                if 'HTTP_X_FORWARDED_SERVER' in environ:
 
116
                    exc = HTTPInternalServerError()
 
117
                    exc.explanation = cant_proxy_correctly_message
 
118
                    raise exc
 
119
                return app(environ, start_response)
 
120
            return wrapped
 
121
        app = check_not_proxied(app)
100
122
    else:
101
123
        app = PrefixMiddleware(app, prefix=prefix)
102
 
    
103
 
    if not options.user_port:
 
124
 
 
125
    app = HTTPExceptionHandler(app)
 
126
    app = ErrorHandlerApp(app)
 
127
 
 
128
    if not config.get_option('user_port'):
104
129
        port = '8080'
105
130
    else:
106
 
        port = options.user_port
 
131
        port = config.get_option('user_port')
107
132
 
108
 
    if not options.user_host:
 
133
    if not config.get_option('user_host'):
109
134
        host = '0.0.0.0'
110
135
    else:
111
 
        host = options.user_host
 
136
        host = config.get_option('user_host')
112
137
 
113
138
    httpserver.serve(app, host=host, port=port)
114
139