← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Martin Albisetti
  • Date: 2008-10-25 19:27:10 UTC
  • mfrom: (219.2.15 abstract_path)
  • Revision ID: martin.albisetti@canonical.com-20081025192710-js2p07p94c7twp9t
 * Use paths to navigate instead of file_ids
 * Cleanups on different methods and variables
 * Fixed bugs: #260363, #269365 and #128926

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