← 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-06-05 01:59:11 UTC
  • Revision ID: mnordhoff@mattnordhoff.com-20090605015911-blapf1agxclubok1
https://launchpad.net/bugs/381029
Fix logging 404 Not Found responses (bug #381029)

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
1
1
#!/usr/bin/env python
 
2
#
 
3
# Copyright (C) 2008, 2009 Canonical Ltd
 
4
#
2
5
# This program is free software; you can redistribute it and/or modify
3
6
# it under the terms of the GNU General Public License as published by
4
7
# the Free Software Foundation; either version 2 of the License, or
19
22
import os
20
23
import sys
21
24
 
22
 
from optparse import OptionParser
 
25
from bzrlib.plugin import load_plugins
 
26
from bzrlib.transport import get_transport
23
27
 
24
28
from paste import httpserver
25
 
from paste.httpexceptions import HTTPExceptionHandler
 
29
from paste.httpexceptions import HTTPExceptionHandler, HTTPInternalServerError
26
30
from paste.translogger import TransLogger
27
31
 
28
32
from loggerhead import __version__
29
 
from loggerhead.apps.filesystem import (
30
 
    BranchesFromFileSystemRoot, UserBranchesFromFileSystemRoot)
 
33
from loggerhead.apps.transport import (
 
34
    BranchesFromTransportRoot, UserBranchesFromTransportRoot)
 
35
from loggerhead.config import LoggerheadConfig
31
36
from loggerhead.util import Reloader
32
37
from loggerhead.apps.error import ErrorHandlerApp
33
38
 
34
39
 
35
 
def command_line_parser():
36
 
    parser = OptionParser("%prog [options] <path>")
37
 
    parser.set_defaults(
38
 
        user_dirs=False,
39
 
        show_version=False,
40
 
        log_folder=None,
41
 
        )
42
 
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
43
 
                      help="Serve user directories as ~user.")
44
 
    parser.add_option("--trunk-dir", metavar="DIR",
45
 
                      help="The directory that contains the trunk branches.")
46
 
    parser.add_option("--port", dest="user_port",
47
 
                      help="Port Loggerhead should listen on (defaults to 8080).")
48
 
    parser.add_option("--host", dest="user_host",
49
 
                      help="Host Loggerhead should listen on.")
50
 
    parser.add_option("--prefix", dest="user_prefix",
51
 
                      help="Specify host prefix.")
52
 
    parser.add_option("--reload", action="store_true", dest="reload",
53
 
                      help="Restarts the application when changing python"
54
 
                           " files. Only used for development purposes.")
55
 
    parser.add_option('--log-folder', dest="log_folder",
56
 
                      type=str, help="The directory to place log files in.")
57
 
    parser.add_option("--version", action="store_true", dest="show_version",
58
 
                      help="Print the software version and exit")
59
 
    return parser
60
 
 
61
 
 
62
40
def main(args):
63
 
    parser = command_line_parser()
64
 
    (options, args) = parser.parse_args(sys.argv[1:])
 
41
    config = LoggerheadConfig()
65
42
 
66
 
    if options.show_version:
 
43
    if config.get_option('show_version'):
67
44
        print "loggerhead %s" % __version__
68
45
        sys.exit(0)
69
46
 
70
 
    if len(args) > 1:
71
 
        parser.print_help()
 
47
    if config.arg_count > 1:
 
48
        config.print_help()
72
49
        sys.exit(1)
73
 
    elif len(args) == 1:
74
 
        [path] = args
 
50
    elif config.arg_count == 1:
 
51
        path = config.get_arg(0)
75
52
    else:
76
53
        path = '.'
77
54
 
78
 
    if not os.path.isdir(path):
79
 
        print "%s is not a directory" % path
80
 
        sys.exit(1)
81
 
 
82
 
    if options.trunk_dir and not options.user_dirs:
 
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
 
 
62
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
83
63
        print "--trunk-dir is only valid with --user-dirs"
84
64
        sys.exit(1)
85
65
 
86
 
    if options.reload:
 
66
    if config.get_option('reload'):
87
67
        if Reloader.is_installed():
88
68
            Reloader.install()
89
69
        else:
90
70
            return Reloader.restart_with_reloader()
91
71
 
92
 
    if options.user_dirs:
93
 
        if not options.trunk_dir:
 
72
    if config.get_option('user_dirs'):
 
73
        if not config.get_option('trunk_dir'):
94
74
            print "You didn't specify a directory for the trunk directories."
95
75
            sys.exit(1)
96
 
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
 
76
        app = UserBranchesFromTransportRoot(transport, config)
97
77
    else:
98
 
        app = BranchesFromFileSystemRoot(path)
 
78
        app = BranchesFromTransportRoot(transport, config)
99
79
 
100
80
    # setup_logging()
101
81
    logging.basicConfig()
102
82
    logging.getLogger('').setLevel(logging.DEBUG)
103
83
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
104
 
    if options.log_folder:
105
 
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
 
84
    if config.get_option('log_folder'):
 
85
        logfile_path = os.path.join(
 
86
            config.get_option('log_folder'), 'serve-branches.log')
106
87
    else:
107
88
        logfile_path = 'serve-branches.log'
108
89
    logfile = logging.FileHandler(logfile_path, 'a')
111
92
    logfile.setFormatter(formatter)
112
93
    logfile.setLevel(logging.DEBUG)
113
94
    logger.addHandler(logfile)
 
95
 
114
96
    # setup_logging() #end
115
 
    app = ErrorHandlerApp(app)
116
 
    app = HTTPExceptionHandler(app)
117
 
    app = TransLogger(app, logger=logger)
118
 
 
119
 
    if not options.user_prefix:
 
97
 
 
98
    if config.get_option('profile'):
 
99
        from loggerhead.middleware.profile import LSProfMiddleware
 
100
        app = LSProfMiddleware(app)
 
101
    if config.get_option('memory_profile'):
 
102
        from dozer import Dozer
 
103
        app = Dozer(app)
 
104
 
 
105
    if not config.get_option('user_prefix'):
120
106
        prefix = '/'
121
107
    else:
122
 
        prefix = options.user_prefix
 
108
        prefix = config.get_option('user_prefix')
 
109
        if not prefix.startswith('/'):
 
110
            prefix = '/' + prefix
123
111
 
124
112
    try:
125
113
        from paste.deploy.config import PrefixMiddleware
126
114
    except ImportError:
127
 
        pass
 
115
        cant_proxy_correctly_message = (
 
116
            'Unsupported configuration: PasteDeploy not available, but '
 
117
            'loggerhead appears to be behind a proxy.')
 
118
        def check_not_proxied(app):
 
119
            def wrapped(environ, start_response):
 
120
                if 'HTTP_X_FORWARDED_SERVER' in environ:
 
121
                    exc = HTTPInternalServerError()
 
122
                    exc.explanation = cant_proxy_correctly_message
 
123
                    raise exc
 
124
                return app(environ, start_response)
 
125
            return wrapped
 
126
        app = check_not_proxied(app)
128
127
    else:
129
128
        app = PrefixMiddleware(app, prefix=prefix)
130
129
 
131
 
    if not options.user_port:
 
130
    app = HTTPExceptionHandler(app)
 
131
    app = ErrorHandlerApp(app)
 
132
    app = TransLogger(app, logger=logger)
 
133
 
 
134
    if not config.get_option('user_port'):
132
135
        port = '8080'
133
136
    else:
134
 
        port = options.user_port
 
137
        port = config.get_option('user_port')
135
138
 
136
 
    if not options.user_host:
 
139
    if not config.get_option('user_host'):
137
140
        host = '0.0.0.0'
138
141
    else:
139
 
        host = options.user_host
 
142
        host = config.get_option('user_host')
140
143
 
141
144
    httpserver.serve(app, host=host, port=port)
142
145