← 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-09 22:45:53 UTC
  • mto: This revision was merged to the branch mainline in revision 221.
  • Revision ID: guillo.gonzo@gmail.com-20080909224553-eev34llmsdwwnjdl
 * added --reload option

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
 
 
32
_reloader_environ_key = 'PYTHON_RELOADER_SHOULD_RUN'
36
33
 
37
34
def command_line_parser():
38
35
    parser = OptionParser("%prog [options] <path>")
39
36
    parser.set_defaults(
40
37
        user_dirs=False,
41
38
        show_version=False,
42
 
        log_folder=None,
43
39
        )
44
40
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
45
41
                      help="Serve user directories as ~user.")
46
42
    parser.add_option("--trunk-dir", metavar="DIR",
47
43
                      help="The directory that contains the trunk branches.")
48
44
    parser.add_option("--port", dest="user_port",
49
 
                      help=("Port Loggerhead should listen on "
50
 
                            "(defaults to 8080)."))
 
45
                      help="Port Loggerhead should listen on (defaults to 8080).")
51
46
    parser.add_option("--host", dest="user_host",
52
47
                      help="Host Loggerhead should listen on.")
53
48
    parser.add_option("--prefix", dest="user_prefix",
54
49
                      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
50
    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.")
 
51
                      help="Use a file monitor to restart the application")
63
52
    parser.add_option("--version", action="store_true", dest="show_version",
64
53
                      help="Print the software version and exit")
65
54
    return parser
66
55
 
67
56
 
68
57
def main(args):
 
58
    logging.basicConfig()
 
59
    logging.getLogger().setLevel(logging.DEBUG)
 
60
 
69
61
    parser = command_line_parser()
70
62
    (options, args) = parser.parse_args(sys.argv[1:])
71
63
 
88
80
    if options.trunk_dir and not options.user_dirs:
89
81
        print "--trunk-dir is only valid with --user-dirs"
90
82
        sys.exit(1)
91
 
 
 
83
        
92
84
    if options.reload:
93
 
        if Reloader.is_installed():
94
 
            Reloader.install()
 
85
        if os.environ.get(_reloader_environ_key):
 
86
            from paste import reloader
 
87
            reloader.install(int(1))
95
88
        else:
96
 
            return Reloader.restart_with_reloader()
 
89
            return restart_with_reloader()
97
90
 
98
91
    if options.user_dirs:
99
92
        if not options.trunk_dir:
102
95
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
103
96
    else:
104
97
        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)
 
98
    app = HTTPExceptionHandler(app)
 
99
    app = TransLogger(app)
125
100
 
126
101
    if not options.user_prefix:
127
102
        prefix = '/'
128
103
    else:
129
104
        prefix = options.user_prefix
130
 
        if not prefix.startswith('/'):
131
 
            prefix = '/' + prefix
132
105
 
133
106
    try:
134
107
        from paste.deploy.config import PrefixMiddleware
135
108
    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)
 
109
        pass
148
110
    else:
149
111
        app = PrefixMiddleware(app, prefix=prefix)
150
 
 
151
 
    app = HTTPExceptionHandler(app)
152
 
    app = ErrorHandlerApp(app)
153
 
 
 
112
    
154
113
    if not options.user_port:
155
114
        port = '8080'
156
115
    else:
161
120
    else:
162
121
        host = options.user_host
163
122
 
164
 
    load_plugins()
165
 
 
166
123
    httpserver.serve(app, host=host, port=port)
 
124
    
 
125
 
 
126
def restart_with_reloader():
 
127
    print 'Starting subprocess with file monitor'
 
128
    while 1:
 
129
        args = [sys.executable] + sys.argv
 
130
        new_environ = os.environ.copy()
 
131
        new_environ[_reloader_environ_key] = 'true'
 
132
        proc = None
 
133
        try:
 
134
            try:
 
135
                import paste.script.serve
 
136
                import subprocess
 
137
                paste.script.serve._turn_sigterm_into_systemexit()
 
138
                proc = subprocess.Popen(args, env=new_environ)
 
139
                exit_code = proc.wait()
 
140
                proc = None
 
141
            except KeyboardInterrupt:
 
142
                print '^C caught in monitor process'
 
143
                return 1
 
144
        finally:
 
145
            if (proc is not None
 
146
                and hasattr(os, 'kill')):
 
147
                import signal
 
148
                try:
 
149
                    os.kill(proc.pid, signal.SIGTERM)
 
150
                except (OSError, IOError):
 
151
                    pass
 
152
            
 
153
        # Reloader always exits with code 3; but if we are
 
154
        # a monitor, any exit code will restart
 
155
        if exit_code != 3:
 
156
            return exit_code
 
157
        print '-'*20, 'Restarting', '-'*20
167
158
 
168
159
 
169
160
if __name__ == "__main__":