← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-10 17:21:19 UTC
  • mfrom: (423.1.1 drop-pre-1.16)
  • Revision ID: jelmer@samba.org-20110210172119-6xa7yiq773p5fqcb
Merge dropping of workarounds for pre-1.16 versions of Bazaar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
41
41
 
42
42
    require_any_api(bzrlib, bzr_compatible_versions)
43
43
 
44
 
    # NB: Normally plugins should lazily load almost everything, but this
45
 
    # seems reasonable to have in-line here: bzrlib.commands and options are
46
 
    # normally loaded, and the rest of loggerhead won't be loaded until serve
47
 
    # --http is run.
48
 
 
49
 
    # transport_server_registry was added in bzr 1.16. When we drop support for
50
 
    # older releases, we can remove the code to override cmd_serve.
51
 
 
52
 
    try:
53
 
        from bzrlib.transport import transport_server_registry
54
 
    except ImportError:
55
 
        transport_server_registry = None
 
44
    from bzrlib.transport import transport_server_registry
56
45
 
57
46
    DEFAULT_HOST = '0.0.0.0'
58
47
    DEFAULT_PORT = 8080
70
59
        logging.getLogger('simpleTAL').addHandler(handler)
71
60
        logging.getLogger('simpleTALES').addHandler(handler)
72
61
 
73
 
 
74
62
    def _ensure_loggerhead_path():
75
63
        """Ensure that you can 'import loggerhead' and get the root."""
76
64
        # loggerhead internal code will try to 'import loggerhead', so
103
91
        app = HTTPExceptionHandler(app)
104
92
        serve(app, host=host, port=port)
105
93
 
106
 
    if transport_server_registry is not None:
107
 
        transport_server_registry.register('http', serve_http, help=HELP)
108
 
    else:
109
 
        import bzrlib.builtins
110
 
        from bzrlib.commands import get_cmd_object, register_command
111
 
        from bzrlib.option import Option
112
 
 
113
 
        _original_command = 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
 
        register_command(cmd_serve)
 
94
    transport_server_registry.register('http', serve_http, help=HELP)
141
95
 
142
96
    def load_tests(standard_tests, module, loader):
143
97
        _ensure_loggerhead_path()