← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Matt Nordhoff
  • Date: 2009-05-17 12:59:29 UTC
  • mfrom: (346.1.1 serve-http-config)
  • mto: This revision was merged to the branch mainline in revision 351.
  • Revision ID: mnordhoff@mattnordhoff.com-20090517125929-6g4a01hyyoqm346w
Merge my serve --http fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
38
38
 
39
39
    require_any_api(bzrlib, [(1, 11, 0), (1, 13, 0), (1, 15, 0)])
40
40
 
 
41
    # TODO: This should provide a new type of server that can be used by bzr
 
42
    # serve, maybe through a registry, rather than overriding the command.  Though
 
43
    # maybe we should keep the wrapper to work with older bzr releases, at least
 
44
    # for a bit.
 
45
 
41
46
    # NB: Normally plugins should lazily load almost everything, but this
42
47
    # seems reasonable to have in-line here: bzrlib.commands and options are
43
48
    # normally loaded, and the rest of loggerhead won't be loaded until serve
44
49
    # --http is run.
45
50
        
46
 
    # transport_server_registry was added in bzr 1.16. When we drop support for
47
 
    # older releases, we can remove the code to override cmd_serve.
48
 
 
49
 
    try:
50
 
        from bzrlib.transport import transport_server_registry
51
 
    except ImportError:
52
 
        transport_server_registry = None
53
 
 
54
 
    DEFAULT_HOST = '0.0.0.0'
 
51
    import bzrlib.builtins
 
52
    from bzrlib.commands import get_cmd_object, register_command
 
53
    from bzrlib.option import Option
 
54
 
 
55
    _original_command = get_cmd_object('serve')
 
56
 
55
57
    DEFAULT_PORT = 8080
56
 
    HELP = ('Loggerhead web-based code viewer and server. (default port: %d)' %
57
 
            (DEFAULT_PORT,))
58
 
 
59
 
    def serve_http(transport, host=None, port=None, inet=None):
60
 
        # loggerhead internal code will try to 'import loggerhead', so
61
 
        # let's put it on the path
62
 
        import os.path, sys
63
 
        sys.path.append(os.path.dirname(__file__))
64
 
 
65
 
        from loggerhead.apps.transport import BranchesFromTransportRoot
66
 
        from loggerhead.config import LoggerheadConfig
67
 
        from paste.httpexceptions import HTTPExceptionHandler
68
 
        from paste.httpserver import serve
69
 
        if host is None:
70
 
            host = DEFAULT_HOST
71
 
        if port is None:
72
 
            port = DEFAULT_PORT
73
 
        allow_writes = not transport.is_readonly()
74
 
        argv = ['--host', host, '--port', str(port),
75
 
            '--allow-writes', allow_writes, transport.base]
76
 
        config = LoggerheadConfig(argv)
77
 
        app = BranchesFromTransportRoot(transport, config)
78
 
        app = HTTPExceptionHandler(app)
79
 
        serve(app, host=host, port=port)
80
 
 
81
 
    if transport_server_registry is not None:
82
 
        transport_server_registry.register('http', serve_http, help=HELP)
83
 
    else:
84
 
        import bzrlib.builtins
85
 
        from bzrlib.commands import get_cmd_object, register_command
86
 
        from bzrlib.option import Option
87
 
 
88
 
        _original_command = get_cmd_object('serve')
89
 
 
90
 
        class cmd_serve(bzrlib.builtins.cmd_serve):
91
 
            __doc__ = _original_command.__doc__
92
 
 
93
 
            takes_options = _original_command.takes_options + [
94
 
                Option('http', help=HELP)]
95
 
 
96
 
            def run(self, *args, **kw):
97
 
                if 'http' in kw:
98
 
                    from bzrlib.transport import get_transport
99
 
                    allow_writes = kw.get('allow_writes', False)
100
 
                    path = kw.get('directory', '.')
101
 
                    port = kw.get('port', DEFAULT_PORT)
102
 
                    # port might be an int already...
103
 
                    if isinstance(port, basestring) and ':' in port:
104
 
                        host, port = port.split(':')
105
 
                    else:
106
 
                        host = DEFAULT_HOST
107
 
                    if allow_writes:
108
 
                        transport = get_transport(path)
109
 
                    else:
110
 
                        transport = get_transport('readonly+' + path)
111
 
                    serve_http(transport, host, port)
 
58
 
 
59
    class cmd_serve(bzrlib.builtins.cmd_serve):
 
60
        __doc__ = _original_command.__doc__
 
61
 
 
62
        takes_options = _original_command.takes_options + [
 
63
            Option('http',
 
64
                help='Run an http (Loggerhead) server to browse code, '
 
65
                    'by default on port %s.' % DEFAULT_PORT)]
 
66
 
 
67
        def run(self, *args, **kw):
 
68
            if 'http' in kw:
 
69
                # loggerhead internal code will try to 'import loggerhead', so
 
70
                # let's put it on the path
 
71
                import os.path, sys
 
72
                sys.path.append(os.path.dirname(__file__))
 
73
 
 
74
                from bzrlib.transport import get_transport
 
75
                from loggerhead.apps.transport import BranchesFromTransportRoot
 
76
                from loggerhead.config import LoggerheadConfig
 
77
                from paste.httpexceptions import HTTPExceptionHandler
 
78
                from paste.httpserver import serve
 
79
                port = kw.get('port', DEFAULT_PORT)
 
80
                # port might be an int already...
 
81
                if isinstance(port, basestring) and ':' in port:
 
82
                    host, port = port.split(':')
112
83
                else:
113
 
                    super(cmd_serve, self).run(*args, **kw)
 
84
                    host = '0.0.0.0'
 
85
                argv = ['--host', host, '--port', str(port)]
 
86
                config = LoggerheadConfig(argv)
 
87
                transport = get_transport('.')
 
88
                app = BranchesFromTransportRoot(transport, config)
 
89
                app = HTTPExceptionHandler(app)
 
90
                serve(app, host=host, port=port)
 
91
            else:
 
92
                super(cmd_serve, self).run(*args, **kw)
114
93
 
115
 
        register_command(cmd_serve)
 
94
    register_command(cmd_serve)