← 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
 
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 (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
 
36
62
def main(args):
37
 
    config = LoggerheadConfig()
 
63
    parser = command_line_parser()
 
64
    (options, args) = parser.parse_args(sys.argv[1:])
38
65
 
39
 
    if config.get_option('show_version'):
 
66
    if options.show_version:
40
67
        print "loggerhead %s" % __version__
41
68
        sys.exit(0)
42
69
 
43
 
    if config.arg_count > 1:
44
 
        config.print_help()
 
70
    if len(args) > 1:
 
71
        parser.print_help()
45
72
        sys.exit(1)
46
 
    elif config.arg_count == 1:
 
73
    elif len(args) == 1:
47
74
        [path] = args
48
75
    else:
49
76
        path = '.'
52
79
        print "%s is not a directory" % path
53
80
        sys.exit(1)
54
81
 
55
 
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
 
82
    if options.trunk_dir and not options.user_dirs:
56
83
        print "--trunk-dir is only valid with --user-dirs"
57
84
        sys.exit(1)
58
 
 
59
 
    if config.get_option('reload'):
 
85
        
 
86
    if options.reload:
60
87
        if Reloader.is_installed():
61
88
            Reloader.install()
62
89
        else:
63
90
            return Reloader.restart_with_reloader()
64
91
 
65
 
    if config.get_option('user_dirs'):
66
 
        if not config.get_option['trunk_dir']:
 
92
    if options.user_dirs:
 
93
        if not options.trunk_dir:
67
94
            print "You didn't specify a directory for the trunk directories."
68
95
            sys.exit(1)
69
 
        app = UserBranchesFromFileSystemRoot(
70
 
            path, config.get_option('trunk_dir'))
 
96
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
71
97
    else:
72
98
        app = BranchesFromFileSystemRoot(path)
73
 
 
 
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
 
    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
114
    # setup_logging() #end
96
 
 
 
115
    app = ErrorHandlerApp(app)
 
116
    app = HTTPExceptionHandler(app)
97
117
    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
118
 
105
 
    if not config.get_option('user_prefix'):
 
119
    if not options.user_prefix:
106
120
        prefix = '/'
107
121
    else:
108
 
        prefix = config.get_option('user_prefix')
109
 
        if not prefix.startswith('/'):
110
 
            prefix = '/' + prefix
 
122
        prefix = options.user_prefix
111
123
 
112
124
    try:
113
125
        from paste.deploy.config import PrefixMiddleware
114
126
    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)
 
127
        pass
127
128
    else:
128
129
        app = PrefixMiddleware(app, prefix=prefix)
129
 
 
130
 
    app = HTTPExceptionHandler(app)
131
 
    app = ErrorHandlerApp(app)
132
 
 
133
 
    if not config.get_option('user_port'):
 
130
    
 
131
    if not options.user_port:
134
132
        port = '8080'
135
133
    else:
136
 
        port = config.get_option('user_port')
 
134
        port = options.user_port
137
135
 
138
 
    if not config.get_option('user_host'):
 
136
    if not options.user_host:
139
137
        host = '0.0.0.0'
140
138
    else:
141
 
        host = config.get_option('user_host')
142
 
 
143
 
    load_plugins()
 
139
        host = options.user_host
144
140
 
145
141
    httpserver.serve(app, host=host, port=port)
146
142