← 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-03-05 23:41:51 UTC
  • mto: This revision was merged to the branch mainline in revision 294.
  • Revision ID: michael.hudson@canonical.com-20090305234151-mrxwixj5z5e92gqd
don't show a "diff" for adding or removing a directory
some associated horribleness reduction.

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