← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Guillermo Gonzalez
  • Date: 2008-09-09 04:26:34 UTC
  • mto: (217.1.9 logging)
  • mto: This revision was merged to the branch mainline in revision 226.
  • Revision ID: guillo.gonzo@gmail.com-20080909042634-i9q3mmbpsv5y3osk
 * added --prefix, --host and --port options to serve-branches man page
 * update NEWS

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
 
22
from optparse import OptionParser
23
23
 
24
24
from paste import httpserver
25
 
from paste.httpexceptions import HTTPExceptionHandler, HTTPInternalServerError
 
25
from paste.httpexceptions import HTTPExceptionHandler
26
26
from paste.translogger import TransLogger
27
27
 
28
28
from loggerhead import __version__
29
29
from loggerhead.apps.filesystem import (
30
30
    BranchesFromFileSystemRoot, UserBranchesFromFileSystemRoot)
31
 
from loggerhead.config import LoggerheadConfig
32
 
from loggerhead.util import Reloader
33
31
from loggerhead.apps.error import ErrorHandlerApp
34
32
 
 
33
def command_line_parser():
 
34
    parser = OptionParser("%prog [options] <path>")
 
35
    parser.set_defaults(
 
36
        user_dirs=False,
 
37
        show_version=False,
 
38
        log_folder=None,
 
39
        )
 
40
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
 
41
                      help="Serve user directories as ~user.")
 
42
    parser.add_option("--trunk-dir", metavar="DIR",
 
43
                      help="The directory that contains the trunk branches.")
 
44
    parser.add_option("--port", dest="user_port",
 
45
                      help="Port Loggerhead should listen on (defaults to 8080).")
 
46
    parser.add_option("--host", dest="user_host",
 
47
                      help="Host Loggerhead should listen on.")
 
48
    parser.add_option("--prefix", dest="user_prefix",
 
49
                      help="Specify host prefix.")
 
50
    parser.add_option("--version", action="store_true", dest="show_version",
 
51
                      help="Print the software version and exit")
 
52
    parser.add_option('--log-folder', dest="log_folder", 
 
53
                      type=str, help="The directory to place log files")
 
54
    return parser
 
55
 
35
56
 
36
57
def main(args):
37
 
    config = LoggerheadConfig()
 
58
    parser = command_line_parser()
 
59
    (options, args) = parser.parse_args(sys.argv[1:])
38
60
 
39
 
    if config.get_option('show_version'):
 
61
    if options.show_version:
40
62
        print "loggerhead %s" % __version__
41
63
        sys.exit(0)
42
64
 
43
 
    if config.arg_count > 1:
44
 
        config.print_help()
 
65
    if len(args) > 1:
 
66
        parser.print_help()
45
67
        sys.exit(1)
46
 
    elif config.arg_count == 1:
 
68
    elif len(args) == 1:
47
69
        [path] = args
48
70
    else:
49
71
        path = '.'
52
74
        print "%s is not a directory" % path
53
75
        sys.exit(1)
54
76
 
55
 
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
 
77
    if options.trunk_dir and not options.user_dirs:
56
78
        print "--trunk-dir is only valid with --user-dirs"
57
79
        sys.exit(1)
58
80
 
59
 
    if config.get_option('reload'):
60
 
        if Reloader.is_installed():
61
 
            Reloader.install()
62
 
        else:
63
 
            return Reloader.restart_with_reloader()
64
 
 
65
 
    if config.get_option('user_dirs'):
66
 
        if not config.get_option['trunk_dir']:
 
81
    if options.user_dirs:
 
82
        if not options.trunk_dir:
67
83
            print "You didn't specify a directory for the trunk directories."
68
84
            sys.exit(1)
69
 
        app = UserBranchesFromFileSystemRoot(
70
 
            path, config.get_option('trunk_dir'))
 
85
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
71
86
    else:
72
87
        app = BranchesFromFileSystemRoot(path)
73
 
 
 
88
    
74
89
    # setup_logging()
75
90
    logging.basicConfig()
76
91
    logging.getLogger('').setLevel(logging.DEBUG)
77
92
    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')
 
93
    if options.log_folder:
 
94
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
81
95
    else:
82
96
        logfile_path = 'serve-branches.log'
83
97
    logfile = logging.FileHandler(logfile_path, 'a')
86
100
    logfile.setFormatter(formatter)
87
101
    logfile.setLevel(logging.DEBUG)
88
102
    logger.addHandler(logfile)
89
 
 
90
 
    if config.get_option('memory_profile'):
91
 
        memprofile = logging.getLogger('loggerhead-memprofile')
92
 
        memprofile.setLevel(logging.DEBUG)
93
 
        memprofile.addHandler(logging.FileHandler('loggerhead-memprofile'))
94
 
 
95
103
    # setup_logging() #end
96
 
 
 
104
    app = ErrorHandlerApp(app)
 
105
    app = HTTPExceptionHandler(app)
97
106
    app = TransLogger(app, logger=logger)
98
 
    if config.get_option('profile'):
99
 
        from loggerhead.middleware.profile import LSProfMiddleware
100
 
        app = LSProfMiddleware(app)
101
 
    if config.get_option('memory_profile'):
102
 
        from loggerhead.middleware.profile import MemoryProfileMiddleware
103
 
        app = MemoryProfileMiddleware(app)
104
 
 
105
 
    if not config.get_option('user_prefix'):
 
107
 
 
108
 
 
109
    if not options.user_prefix:
106
110
        prefix = '/'
107
111
    else:
108
 
        prefix = config.get_option('user_prefix')
109
 
        if not prefix.startswith('/'):
110
 
            prefix = '/' + prefix
 
112
        prefix = options.user_prefix
111
113
 
112
114
    try:
113
115
        from paste.deploy.config import PrefixMiddleware
114
116
    except ImportError:
115
 
        cant_proxy_correctly_message = (
116
 
            'Unsupported configuration: PasteDeploy not available, but '
117
 
            'loggerhead appears to be behind a proxy.')
118
 
        def check_not_proxied(app):
119
 
            def wrapped(environ, start_response):
120
 
                if 'HTTP_X_FORWARDED_SERVER' in environ:
121
 
                    exc = HTTPInternalServerError()
122
 
                    exc.explanation = cant_proxy_correctly_message
123
 
                    raise exc
124
 
                return app(environ, start_response)
125
 
            return wrapped
126
 
        app = check_not_proxied(app)
 
117
        pass
127
118
    else:
128
119
        app = PrefixMiddleware(app, prefix=prefix)
129
 
 
130
 
    app = HTTPExceptionHandler(app)
131
 
    app = ErrorHandlerApp(app)
132
 
 
133
 
    if not config.get_option('user_port'):
 
120
    
 
121
    if not options.user_port:
134
122
        port = '8080'
135
123
    else:
136
 
        port = config.get_option('user_port')
 
124
        port = options.user_port
137
125
 
138
 
    if not config.get_option('user_host'):
 
126
    if not options.user_host:
139
127
        host = '0.0.0.0'
140
128
    else:
141
 
        host = config.get_option('user_host')
142
 
 
143
 
    load_plugins()
 
129
        host = options.user_host
144
130
 
145
131
    httpserver.serve(app, host=host, port=port)
146
132