← 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-09-01 21:47:21 UTC
  • mfrom: (215.1.6 1.6.1)
  • Revision ID: argentina@gmail.com-20080901214721-cdlcjue6ggr6y86q
Tags: loggerhead-1.6.1
* Added --port, --host and --prefix options to serve-branches
* Fixed broken template for project browsing with start-loggerhead

Show diffs side-by-side

added added

removed removed

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