← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Francesco 'pr0gg3d' Del Degan
  • Date: 2011-08-08 20:58:09 UTC
  • mto: This revision was merged to the branch mainline in revision 454.
  • Revision ID: f.deldegan@pr0gg3d.net-20110808205809-n3eg73n80ymyd6kj
https://launchpad.net/bugs/820065
Fixes bug in annotate that occurs when file is zero-sized

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
30
30
starts a web server to browse the contents of a branch.
31
31
"""
32
32
 
 
33
import sys
 
34
 
33
35
from info import (
34
36
    bzr_plugin_version as version_info,
35
37
    bzr_compatible_versions,
42
44
 
43
45
    require_any_api(bzrlib, bzr_compatible_versions)
44
46
 
45
 
    # NB: Normally plugins should lazily load almost everything, but this
46
 
    # seems reasonable to have in-line here: bzrlib.commands and options are
47
 
    # normally loaded, and the rest of loggerhead won't be loaded until serve
48
 
    # --http is run.
49
 
 
50
 
    # transport_server_registry was added in bzr 1.16. When we drop support for
51
 
    # older releases, we can remove the code to override cmd_serve.
52
 
 
53
 
    try:
54
 
        from bzrlib.transport import transport_server_registry
55
 
    except ImportError:
56
 
        transport_server_registry = None
 
47
    from bzrlib.transport import transport_server_registry
57
48
 
58
49
    DEFAULT_HOST = '0.0.0.0'
59
50
    DEFAULT_PORT = 8080
60
51
    HELP = ('Loggerhead, a web-based code viewer and server. (default port: %d)' %
61
52
            (DEFAULT_PORT,))
62
53
 
63
 
    def setup_logging(config):
64
 
        import logging
65
 
        import sys
66
 
 
67
 
        logger = logging.getLogger('loggerhead')
68
 
        handler = logging.StreamHandler(sys.stderr)
69
 
        handler.setLevel(logging.DEBUG)
70
 
        logger.addHandler(handler)
71
 
        logging.getLogger('simpleTAL').addHandler(handler)
72
 
        logging.getLogger('simpleTALES').addHandler(handler)
73
 
 
74
 
 
75
54
    def _ensure_loggerhead_path():
76
55
        """Ensure that you can 'import loggerhead' and get the root."""
77
56
        # loggerhead internal code will try to 'import loggerhead', so
83
62
            sys.path.append(os.path.dirname(__file__))
84
63
 
85
64
    def serve_http(transport, host=None, port=None, inet=None):
 
65
        # TODO: if we supported inet to pass requests in and respond to them,
 
66
        #       then it would be easier to test the full stack, but it probably
 
67
        #       means routing around paste.httpserver.serve which probably
 
68
        #       isn't testing the full stack
86
69
        from paste.httpexceptions import HTTPExceptionHandler
87
70
        from paste.httpserver import serve
88
71
 
89
72
        _ensure_loggerhead_path()
90
73
 
 
74
        from loggerhead.apps.http_head import HeadMiddleware
91
75
        from loggerhead.apps.transport import BranchesFromTransportRoot
92
76
        from loggerhead.config import LoggerheadConfig
 
77
        from loggerhead.main import setup_logging
93
78
 
94
79
        if host is None:
95
80
            host = DEFAULT_HOST
99
84
        if not transport.is_readonly():
100
85
            argv.insert(0, '--allow-writes')
101
86
        config = LoggerheadConfig(argv)
102
 
        setup_logging(config)
 
87
        setup_logging(config, init_logging=False, log_file=sys.stderr)
103
88
        app = BranchesFromTransportRoot(transport.base, config)
 
89
        # Bug #758618, HeadMiddleware seems to break HTTPExceptionHandler from
 
90
        # actually sending appropriate return codes to the client. Since nobody
 
91
        # desperately needs HeadMiddleware right now, just ignoring it.
 
92
        # app = HeadMiddleware(app)
104
93
        app = HTTPExceptionHandler(app)
105
94
        serve(app, host=host, port=port)
106
95
 
107
 
    if transport_server_registry is not None:
108
 
        transport_server_registry.register('http', serve_http, help=HELP)
109
 
    else:
110
 
        import bzrlib.builtins
111
 
        from bzrlib.option import Option
112
 
 
113
 
        _original_command = commands.get_cmd_object('serve')
114
 
 
115
 
        class cmd_serve(bzrlib.builtins.cmd_serve):
116
 
            __doc__ = _original_command.__doc__
117
 
 
118
 
            takes_options = _original_command.takes_options + [
119
 
                Option('http', help=HELP)]
120
 
 
121
 
            def run(self, *args, **kw):
122
 
                if 'http' in kw:
123
 
                    from bzrlib.transport import get_transport
124
 
                    allow_writes = kw.get('allow_writes', False)
125
 
                    path = kw.get('directory', '.')
126
 
                    port = kw.get('port', DEFAULT_PORT)
127
 
                    # port might be an int already...
128
 
                    if isinstance(port, basestring) and ':' in port:
129
 
                        host, port = port.split(':')
130
 
                    else:
131
 
                        host = DEFAULT_HOST
132
 
                    if allow_writes:
133
 
                        transport = get_transport(path)
134
 
                    else:
135
 
                        transport = get_transport('readonly+' + path)
136
 
                    serve_http(transport, host, port)
137
 
                else:
138
 
                    super(cmd_serve, self).run(*args, **kw)
139
 
 
140
 
        commands.register_command(cmd_serve)
 
96
    transport_server_registry.register('http', serve_http, help=HELP)
141
97
 
142
98
    class cmd_load_test_loggerhead(commands.Command):
143
99
        """Run a load test against a live loggerhead instance.
151
107
        def run(self, filename):
152
108
            from bzrlib.plugins.loggerhead.loggerhead import load_test
153
109
            script = load_test.run_script(filename)
154
 
            for worker,_  in script._threads.itervalues():
 
110
            for thread_id in sorted(script._threads):
 
111
                worker = script._threads[thread_id][0]
155
112
                for url, success, time in worker.stats:
156
113
                    self.outf.write(' %5.3fs %s %s\n'
157
114
                                    % (time, str(success)[0], url))