← 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
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("--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
 
 
66
37
def main(args):
67
 
    parser = command_line_parser()
68
 
    (options, args) = parser.parse_args(sys.argv[1:])
 
38
    config = LoggerheadConfig()
69
39
 
70
 
    if options.show_version:
 
40
    if config.get_option('show_version'):
71
41
        print "loggerhead %s" % __version__
72
42
        sys.exit(0)
73
43
 
74
 
    if len(args) > 1:
75
 
        parser.print_help()
 
44
    if config.arg_count > 1:
 
45
        config.print_help()
76
46
        sys.exit(1)
77
 
    elif len(args) == 1:
78
 
        [path] = args
 
47
    elif config.arg_count == 1:
 
48
        path = config.get_arg(0)
79
49
    else:
80
50
        path = '.'
81
51
 
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:
 
52
    load_plugins()
 
53
 
 
54
    transport = get_transport(path)
 
55
 
 
56
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
87
57
        print "--trunk-dir is only valid with --user-dirs"
88
58
        sys.exit(1)
89
59
 
90
 
    if options.reload:
 
60
    if config.get_option('reload'):
91
61
        if Reloader.is_installed():
92
62
            Reloader.install()
93
63
        else:
94
64
            return Reloader.restart_with_reloader()
95
65
 
96
 
    if options.user_dirs:
97
 
        if not options.trunk_dir:
 
66
    if config.get_option('user_dirs'):
 
67
        if not config.get_option('trunk_dir'):
98
68
            print "You didn't specify a directory for the trunk directories."
99
69
            sys.exit(1)
100
 
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
 
70
        app = UserBranchesFromTransportRoot(transport, config)
101
71
    else:
102
 
        app = BranchesFromFileSystemRoot(path)
 
72
        app = BranchesFromTransportRoot(transport, config)
103
73
 
104
74
    # setup_logging()
105
75
    logging.basicConfig()
106
76
    logging.getLogger('').setLevel(logging.DEBUG)
107
77
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
108
 
    if options.log_folder:
109
 
        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')
110
81
    else:
111
82
        logfile_path = 'serve-branches.log'
112
83
    logfile = logging.FileHandler(logfile_path, 'a')
115
86
    logfile.setFormatter(formatter)
116
87
    logfile.setLevel(logging.DEBUG)
117
88
    logger.addHandler(logfile)
 
89
 
118
90
    # setup_logging() #end
 
91
 
119
92
    app = TransLogger(app, logger=logger)
120
 
    if options.profile:
 
93
    if config.get_option('profile'):
121
94
        from loggerhead.middleware.profile import LSProfMiddleware
122
95
        app = LSProfMiddleware(app)
 
96
    if config.get_option('memory_profile'):
 
97
        from dozer import Dozer
 
98
        app = Dozer(app)
123
99
 
124
 
    if not options.user_prefix:
 
100
    if not config.get_option('user_prefix'):
125
101
        prefix = '/'
126
102
    else:
127
 
        prefix = options.user_prefix
 
103
        prefix = config.get_option('user_prefix')
 
104
        if not prefix.startswith('/'):
 
105
            prefix = '/' + prefix
128
106
 
129
107
    try:
130
108
        from paste.deploy.config import PrefixMiddleware
144
122
    else:
145
123
        app = PrefixMiddleware(app, prefix=prefix)
146
124
 
 
125
    app = HTTPExceptionHandler(app)
147
126
    app = ErrorHandlerApp(app)
148
 
    app = HTTPExceptionHandler(app)
149
127
 
150
 
    if not options.user_port:
 
128
    if not config.get_option('user_port'):
151
129
        port = '8080'
152
130
    else:
153
 
        port = options.user_port
 
131
        port = config.get_option('user_port')
154
132
 
155
 
    if not options.user_host:
 
133
    if not config.get_option('user_host'):
156
134
        host = '0.0.0.0'
157
135
    else:
158
 
        host = options.user_host
 
136
        host = config.get_option('user_host')
159
137
 
160
138
    httpserver.serve(app, host=host, port=port)
161
139