← 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-13 14:03:48 UTC
  • mto: (389.2.2 pep8-2009-10)
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: mnordhoff@mattnordhoff.com-20090513140348-yn43gztulksm62e9
Always use a tuple in string formatting

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