← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: John Arbash Meinel
  • Date: 2011-02-10 01:57:32 UTC
  • mfrom: (425 trunk)
  • mto: This revision was merged to the branch mainline in revision 426.
  • Revision ID: john@arbash-meinel.com-20110210015732-b3kkt1jp7bsqcv0v
Merge loggerhead trunk back into load-test to resolve
__init__.py conflicts from Jelmer's update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
42
42
 
43
43
    require_any_api(bzrlib, bzr_compatible_versions)
44
44
 
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
 
45
    from bzrlib.transport import transport_server_registry
57
46
 
58
47
    DEFAULT_HOST = '0.0.0.0'
59
48
    DEFAULT_PORT = 8080
71
60
        logging.getLogger('simpleTAL').addHandler(handler)
72
61
        logging.getLogger('simpleTALES').addHandler(handler)
73
62
 
74
 
 
75
63
    def _ensure_loggerhead_path():
76
64
        """Ensure that you can 'import loggerhead' and get the root."""
77
65
        # loggerhead internal code will try to 'import loggerhead', so
104
92
        app = HTTPExceptionHandler(app)
105
93
        serve(app, host=host, port=port)
106
94
 
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)
 
95
    transport_server_registry.register('http', serve_http, help=HELP)
141
96
 
142
97
    class cmd_load_test_loggerhead(commands.Command):
143
98
        """Run a load test against a live loggerhead instance.