← 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-03 03:30:38 UTC
  • mto: (359.3.3 hpss-writes)
  • mto: This revision was merged to the branch mainline in revision 362.
  • Revision ID: mnordhoff@mattnordhoff.com-20090603033038-v7rycl4x7ivrxhit
Add an --allow-writes option to serve-branches and "bzr serve"

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
    if config.get_option('allow_writes'):
 
55
        transport = get_transport(path)
 
56
    else:
 
57
        transport = get_transport('readonly+' + path)
 
58
 
 
59
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
78
60
        print "--trunk-dir is only valid with --user-dirs"
79
61
        sys.exit(1)
80
62
 
81
 
    if options.user_dirs:
82
 
        if not options.trunk_dir:
 
63
    if config.get_option('reload'):
 
64
        if Reloader.is_installed():
 
65
            Reloader.install()
 
66
        else:
 
67
            return Reloader.restart_with_reloader()
 
68
 
 
69
    if config.get_option('user_dirs'):
 
70
        if not config.get_option('trunk_dir'):
83
71
            print "You didn't specify a directory for the trunk directories."
84
72
            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:
 
73
        app = UserBranchesFromTransportRoot(transport, config)
 
74
    else:
 
75
        app = BranchesFromTransportRoot(transport, config)
 
76
 
 
77
    # setup_logging()
 
78
    logging.basicConfig()
 
79
    logging.getLogger('').setLevel(logging.DEBUG)
 
80
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
 
81
    if config.get_option('log_folder'):
 
82
        logfile_path = os.path.join(
 
83
            config.get_option('log_folder'), 'serve-branches.log')
 
84
    else:
 
85
        logfile_path = 'serve-branches.log'
 
86
    logfile = logging.FileHandler(logfile_path, 'a')
 
87
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
 
88
                                  ' %(message)s')
 
89
    logfile.setFormatter(formatter)
 
90
    logfile.setLevel(logging.DEBUG)
 
91
    logger.addHandler(logfile)
 
92
 
 
93
    # setup_logging() #end
 
94
 
 
95
    app = TransLogger(app, logger=logger)
 
96
    if config.get_option('profile'):
 
97
        from loggerhead.middleware.profile import LSProfMiddleware
 
98
        app = LSProfMiddleware(app)
 
99
    if config.get_option('memory_profile'):
 
100
        from dozer import Dozer
 
101
        app = Dozer(app)
 
102
 
 
103
    if not config.get_option('user_prefix'):
92
104
        prefix = '/'
93
105
    else:
94
 
        prefix = options.user_prefix
 
106
        prefix = config.get_option('user_prefix')
 
107
        if not prefix.startswith('/'):
 
108
            prefix = '/' + prefix
95
109
 
96
110
    try:
97
111
        from paste.deploy.config import PrefixMiddleware
98
112
    except ImportError:
99
 
        pass
 
113
        cant_proxy_correctly_message = (
 
114
            'Unsupported configuration: PasteDeploy not available, but '
 
115
            'loggerhead appears to be behind a proxy.')
 
116
        def check_not_proxied(app):
 
117
            def wrapped(environ, start_response):
 
118
                if 'HTTP_X_FORWARDED_SERVER' in environ:
 
119
                    exc = HTTPInternalServerError()
 
120
                    exc.explanation = cant_proxy_correctly_message
 
121
                    raise exc
 
122
                return app(environ, start_response)
 
123
            return wrapped
 
124
        app = check_not_proxied(app)
100
125
    else:
101
126
        app = PrefixMiddleware(app, prefix=prefix)
102
 
    
103
 
    if not options.user_port:
 
127
 
 
128
    app = HTTPExceptionHandler(app)
 
129
    app = ErrorHandlerApp(app)
 
130
 
 
131
    if not config.get_option('user_port'):
104
132
        port = '8080'
105
133
    else:
106
 
        port = options.user_port
 
134
        port = config.get_option('user_port')
107
135
 
108
 
    if not options.user_host:
 
136
    if not config.get_option('user_host'):
109
137
        host = '0.0.0.0'
110
138
    else:
111
 
        host = options.user_host
 
139
        host = config.get_option('user_host')
112
140
 
113
141
    httpserver.serve(app, host=host, port=port)
114
142