← 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-04-09 17:19:11 UTC
  • mfrom: (324.1.1 trunk)
  • Revision ID: mnordhoff@mattnordhoff.com-20090409171911-2xb66d8ts6gf0dnp
Mention bug # for branches served through http in NEWS. (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
23
 
24
24
from paste import httpserver
25
 
from paste.httpexceptions import HTTPExceptionHandler
 
25
from paste.httpexceptions import HTTPExceptionHandler, HTTPInternalServerError
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
31
32
from loggerhead.util import Reloader
32
 
 
33
 
 
34
 
def command_line_parser():
35
 
    parser = OptionParser("%prog [options] <path>")
36
 
    parser.set_defaults(
37
 
        user_dirs=False,
38
 
        show_version=False,
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("--reload", action="store_true", dest="reload",
51
 
                      help="Restarts the application when changing python"
52
 
                           " files. Only used for development purposes.")
53
 
    parser.add_option("--version", action="store_true", dest="show_version",
54
 
                      help="Print the software version and exit")
55
 
    return parser
 
33
from loggerhead.apps.error import ErrorHandlerApp
56
34
 
57
35
 
58
36
def main(args):
59
 
    logging.basicConfig()
60
 
    logging.getLogger().setLevel(logging.DEBUG)
61
 
 
62
 
    parser = command_line_parser()
63
 
    (options, args) = parser.parse_args(sys.argv[1:])
64
 
 
65
 
    if options.show_version:
 
37
    config = LoggerheadConfig()
 
38
 
 
39
    if config.get_option('show_version'):
66
40
        print "loggerhead %s" % __version__
67
41
        sys.exit(0)
68
42
 
69
 
    if len(args) > 1:
70
 
        parser.print_help()
 
43
    if config.arg_count > 1:
 
44
        config.print_help()
71
45
        sys.exit(1)
72
 
    elif len(args) == 1:
73
 
        [path] = args
 
46
    elif config.arg_count == 1:
 
47
        path = config.get_arg(0)
74
48
    else:
75
49
        path = '.'
76
50
 
78
52
        print "%s is not a directory" % path
79
53
        sys.exit(1)
80
54
 
81
 
    if options.trunk_dir and not options.user_dirs:
 
55
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
82
56
        print "--trunk-dir is only valid with --user-dirs"
83
57
        sys.exit(1)
84
 
        
85
 
    if options.reload:
 
58
 
 
59
    if config.get_option('reload'):
86
60
        if Reloader.is_installed():
87
61
            Reloader.install()
88
62
        else:
89
63
            return Reloader.restart_with_reloader()
90
64
 
91
 
    if options.user_dirs:
92
 
        if not options.trunk_dir:
 
65
    if config.get_option('user_dirs'):
 
66
        if not config.get_option['trunk_dir']:
93
67
            print "You didn't specify a directory for the trunk directories."
94
68
            sys.exit(1)
95
 
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
 
69
        app = UserBranchesFromFileSystemRoot(
 
70
            path, config.get_option('trunk_dir'))
96
71
    else:
97
72
        app = BranchesFromFileSystemRoot(path)
98
 
    app = HTTPExceptionHandler(app)
99
 
    app = TransLogger(app)
100
 
 
101
 
    if not options.user_prefix:
 
73
 
 
74
    # setup_logging()
 
75
    logging.basicConfig()
 
76
    logging.getLogger('').setLevel(logging.DEBUG)
 
77
    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')
 
81
    else:
 
82
        logfile_path = 'serve-branches.log'
 
83
    logfile = logging.FileHandler(logfile_path, 'a')
 
84
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
 
85
                                  ' %(message)s')
 
86
    logfile.setFormatter(formatter)
 
87
    logfile.setLevel(logging.DEBUG)
 
88
    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
    # setup_logging() #end
 
96
 
 
97
    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'):
102
106
        prefix = '/'
103
107
    else:
104
 
        prefix = options.user_prefix
 
108
        prefix = config.get_option('user_prefix')
 
109
        if not prefix.startswith('/'):
 
110
            prefix = '/' + prefix
105
111
 
106
112
    try:
107
113
        from paste.deploy.config import PrefixMiddleware
108
114
    except ImportError:
109
 
        pass
 
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)
110
127
    else:
111
128
        app = PrefixMiddleware(app, prefix=prefix)
112
 
    
113
 
    if not options.user_port:
 
129
 
 
130
    app = HTTPExceptionHandler(app)
 
131
    app = ErrorHandlerApp(app)
 
132
 
 
133
    if not config.get_option('user_port'):
114
134
        port = '8080'
115
135
    else:
116
 
        port = options.user_port
 
136
        port = config.get_option('user_port')
117
137
 
118
 
    if not options.user_host:
 
138
    if not config.get_option('user_host'):
119
139
        host = '0.0.0.0'
120
140
    else:
121
 
        host = options.user_host
 
141
        host = config.get_option('user_host')
 
142
 
 
143
    load_plugins()
122
144
 
123
145
    httpserver.serve(app, host=host, port=port)
124
146