← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Michael Hudson
  • Date: 2009-02-10 01:25:34 UTC
  • Revision ID: michael.hudson@canonical.com-20090210012534-gnj6tf3iryq6wqiv
apply neror's patch to fix bug #260547 ("start-loggerhead script doesn't properly set the wsgi.url_scheme from the server.webpath option")

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 bzrlib.plugin import load_plugins
23
 
from bzrlib.transport import get_transport
 
22
from optparse import OptionParser
24
23
 
25
24
from paste import httpserver
26
25
from paste.httpexceptions import HTTPExceptionHandler, HTTPInternalServerError
27
26
from paste.translogger import TransLogger
28
27
 
29
28
from loggerhead import __version__
30
 
from loggerhead.apps.transport import (
31
 
    BranchesFromTransportRoot, UserBranchesFromTransportRoot)
32
 
from loggerhead.config import LoggerheadConfig
 
29
from loggerhead.apps.filesystem import (
 
30
    BranchesFromFileSystemRoot, UserBranchesFromFileSystemRoot)
33
31
from loggerhead.util import Reloader
34
32
from loggerhead.apps.error import ErrorHandlerApp
35
33
 
36
34
 
 
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("--profile", action="store_true", dest="profile",
 
54
                      help="Generate callgrind profile data to "
 
55
                        "%d-stats.callgrind on each request.")
 
56
    parser.add_option("--reload", action="store_true", dest="reload",
 
57
                      help="Restarts the application when changing python"
 
58
                           " files. Only used for development purposes.")
 
59
    parser.add_option('--log-folder', dest="log_folder",
 
60
                      type=str, help="The directory to place log files in.")
 
61
    parser.add_option("--version", action="store_true", dest="show_version",
 
62
                      help="Print the software version and exit")
 
63
    return parser
 
64
 
 
65
 
37
66
def main(args):
38
 
    config = LoggerheadConfig()
 
67
    parser = command_line_parser()
 
68
    (options, args) = parser.parse_args(sys.argv[1:])
39
69
 
40
 
    if config.get_option('show_version'):
 
70
    if options.show_version:
41
71
        print "loggerhead %s" % __version__
42
72
        sys.exit(0)
43
73
 
44
 
    if config.arg_count > 1:
45
 
        config.print_help()
 
74
    if len(args) > 1:
 
75
        parser.print_help()
46
76
        sys.exit(1)
47
 
    elif config.arg_count == 1:
48
 
        path = config.get_arg(0)
 
77
    elif len(args) == 1:
 
78
        [path] = args
49
79
    else:
50
80
        path = '.'
51
81
 
52
 
    load_plugins()
53
 
 
54
 
    transport = get_transport(path)
55
 
 
56
 
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
 
82
    if not os.path.isdir(path):
 
83
        print "%s is not a directory" % path
 
84
        sys.exit(1)
 
85
 
 
86
    if options.trunk_dir and not options.user_dirs:
57
87
        print "--trunk-dir is only valid with --user-dirs"
58
88
        sys.exit(1)
59
89
 
60
 
    if config.get_option('reload'):
 
90
    if options.reload:
61
91
        if Reloader.is_installed():
62
92
            Reloader.install()
63
93
        else:
64
94
            return Reloader.restart_with_reloader()
65
95
 
66
 
    if config.get_option('user_dirs'):
67
 
        if not config.get_option('trunk_dir'):
 
96
    if options.user_dirs:
 
97
        if not options.trunk_dir:
68
98
            print "You didn't specify a directory for the trunk directories."
69
99
            sys.exit(1)
70
 
        app = UserBranchesFromTransportRoot(transport, config)
 
100
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
71
101
    else:
72
 
        app = BranchesFromTransportRoot(transport, config)
 
102
        app = BranchesFromFileSystemRoot(path)
73
103
 
74
104
    # setup_logging()
75
105
    logging.basicConfig()
76
106
    logging.getLogger('').setLevel(logging.DEBUG)
77
107
    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')
 
108
    if options.log_folder:
 
109
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
81
110
    else:
82
111
        logfile_path = 'serve-branches.log'
83
112
    logfile = logging.FileHandler(logfile_path, 'a')
86
115
    logfile.setFormatter(formatter)
87
116
    logfile.setLevel(logging.DEBUG)
88
117
    logger.addHandler(logfile)
89
 
 
90
118
    # setup_logging() #end
91
 
 
92
119
    app = TransLogger(app, logger=logger)
93
 
    if config.get_option('profile'):
 
120
    if options.profile:
94
121
        from loggerhead.middleware.profile import LSProfMiddleware
95
122
        app = LSProfMiddleware(app)
96
 
    if config.get_option('memory_profile'):
97
 
        from dozer import Dozer
98
 
        app = Dozer(app)
99
123
 
100
 
    if not config.get_option('user_prefix'):
 
124
    if not options.user_prefix:
101
125
        prefix = '/'
102
126
    else:
103
 
        prefix = config.get_option('user_prefix')
104
 
        if not prefix.startswith('/'):
105
 
            prefix = '/' + prefix
 
127
        prefix = options.user_prefix
106
128
 
107
129
    try:
108
130
        from paste.deploy.config import PrefixMiddleware
122
144
    else:
123
145
        app = PrefixMiddleware(app, prefix=prefix)
124
146
 
 
147
    app = ErrorHandlerApp(app)
125
148
    app = HTTPExceptionHandler(app)
126
 
    app = ErrorHandlerApp(app)
127
149
 
128
 
    if not config.get_option('user_port'):
 
150
    if not options.user_port:
129
151
        port = '8080'
130
152
    else:
131
 
        port = config.get_option('user_port')
 
153
        port = options.user_port
132
154
 
133
 
    if not config.get_option('user_host'):
 
155
    if not options.user_host:
134
156
        host = '0.0.0.0'
135
157
    else:
136
 
        host = config.get_option('user_host')
 
158
        host = options.user_host
137
159
 
138
160
    httpserver.serve(app, host=host, port=port)
139
161