← 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-10 23:12:59 UTC
  • mfrom: (221 trunk)
  • mto: (217.1.9 logging)
  • mto: This revision was merged to the branch mainline in revision 226.
  • Revision ID: guillo.gonzo@gmail.com-20080910231259-4wnfmu30f4n90w6x
 * merge with trunk (resolve conflicts in NEWS and serve-branches)

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