← 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-29 13:26:20 UTC
  • mfrom: (356.1.1 trunk)
  • Revision ID: mnordhoff@mattnordhoff.com-20090529132620-jlb2il586qa46y7o
Fix displaying symlinks to nonexistent targets in the directory UI. (Jelmer Vernooij)

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)
 
30
from loggerhead.apps.transport import (
 
31
    BranchesFromTransportRoot, UserBranchesFromTransportRoot)
 
32
from loggerhead.config import LoggerheadConfig
31
33
from loggerhead.util import Reloader
32
34
from loggerhead.apps.error import ErrorHandlerApp
33
35
 
34
36
 
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 "
48
 
                            "(defaults to 8080)."))
49
 
    parser.add_option("--host", dest="user_host",
50
 
                      help="Host Loggerhead should listen on.")
51
 
    parser.add_option("--prefix", dest="user_prefix",
52
 
                      help="Specify host prefix.")
53
 
    parser.add_option("--reload", action="store_true", dest="reload",
54
 
                      help="Restarts the application when changing python"
55
 
                           " files. Only used for development purposes.")
56
 
    parser.add_option('--log-folder', dest="log_folder",
57
 
                      type=str, help="The directory to place log files in.")
58
 
    parser.add_option("--version", action="store_true", dest="show_version",
59
 
                      help="Print the software version and exit")
60
 
    return parser
61
 
 
62
 
 
63
37
def main(args):
64
 
    parser = command_line_parser()
65
 
    (options, args) = parser.parse_args(sys.argv[1:])
 
38
    config = LoggerheadConfig()
66
39
 
67
 
    if options.show_version:
 
40
    if config.get_option('show_version'):
68
41
        print "loggerhead %s" % __version__
69
42
        sys.exit(0)
70
43
 
71
 
    if len(args) > 1:
72
 
        parser.print_help()
 
44
    if config.arg_count > 1:
 
45
        config.print_help()
73
46
        sys.exit(1)
74
 
    elif len(args) == 1:
75
 
        [path] = args
 
47
    elif config.arg_count == 1:
 
48
        path = config.get_arg(0)
76
49
    else:
77
50
        path = '.'
78
51
 
79
 
    if not os.path.isdir(path):
80
 
        print "%s is not a directory" % path
81
 
        sys.exit(1)
82
 
 
83
 
    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'):
84
57
        print "--trunk-dir is only valid with --user-dirs"
85
58
        sys.exit(1)
86
59
 
87
 
    if options.reload:
 
60
    if config.get_option('reload'):
88
61
        if Reloader.is_installed():
89
62
            Reloader.install()
90
63
        else:
91
64
            return Reloader.restart_with_reloader()
92
65
 
93
 
    if options.user_dirs:
94
 
        if not options.trunk_dir:
 
66
    if config.get_option('user_dirs'):
 
67
        if not config.get_option('trunk_dir'):
95
68
            print "You didn't specify a directory for the trunk directories."
96
69
            sys.exit(1)
97
 
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
 
70
        app = UserBranchesFromTransportRoot(transport, config)
98
71
    else:
99
 
        app = BranchesFromFileSystemRoot(path)
 
72
        app = BranchesFromTransportRoot(transport, config)
100
73
 
101
74
    # setup_logging()
102
75
    logging.basicConfig()
103
76
    logging.getLogger('').setLevel(logging.DEBUG)
104
77
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
105
 
    if options.log_folder:
106
 
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
 
78
    if config.get_option('log_folder'):
 
79
        logfile_path = os.path.join(
 
80
            config.get_option('log_folder'), 'serve-branches.log')
107
81
    else:
108
82
        logfile_path = 'serve-branches.log'
109
83
    logfile = logging.FileHandler(logfile_path, 'a')
112
86
    logfile.setFormatter(formatter)
113
87
    logfile.setLevel(logging.DEBUG)
114
88
    logger.addHandler(logfile)
 
89
 
115
90
    # setup_logging() #end
116
 
    app = ErrorHandlerApp(app)
117
 
    app = HTTPExceptionHandler(app)
 
91
 
118
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)
119
99
 
120
 
    if not options.user_prefix:
 
100
    if not config.get_option('user_prefix'):
121
101
        prefix = '/'
122
102
    else:
123
 
        prefix = options.user_prefix
 
103
        prefix = config.get_option('user_prefix')
 
104
        if not prefix.startswith('/'):
 
105
            prefix = '/' + prefix
124
106
 
125
107
    try:
126
108
        from paste.deploy.config import PrefixMiddleware
127
109
    except ImportError:
128
 
        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)
129
122
    else:
130
123
        app = PrefixMiddleware(app, prefix=prefix)
131
124
 
132
 
    if not options.user_port:
 
125
    app = HTTPExceptionHandler(app)
 
126
    app = ErrorHandlerApp(app)
 
127
 
 
128
    if not config.get_option('user_port'):
133
129
        port = '8080'
134
130
    else:
135
 
        port = options.user_port
 
131
        port = config.get_option('user_port')
136
132
 
137
 
    if not options.user_host:
 
133
    if not config.get_option('user_host'):
138
134
        host = '0.0.0.0'
139
135
    else:
140
 
        host = options.user_host
 
136
        host = config.get_option('user_host')
141
137
 
142
138
    httpserver.serve(app, host=host, port=port)
143
139