← 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-19 01:24:20 UTC
  • mto: This revision was merged to the branch mainline in revision 271.
  • Revision ID: michael.hudson@canonical.com-20090219012420-c6s1j3etl2t4r7wa
defer loading of plugins until after we've set up the logging

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