← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Martin Albisetti
  • Date: 2009-05-28 08:17:40 UTC
  • mfrom: (356 trunk)
  • mto: (352.6.11 serve-config)
  • mto: This revision was merged to the branch mainline in revision 364.
  • Revision ID: martin.albisetti@canonical.com-20090528081740-t9wx5c7fz7s121ge
Merge from trunk and fix conflict by refactoring the code

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
 
 
46
41
    # NB: Normally plugins should lazily load almost everything, but this
47
42
    # seems reasonable to have in-line here: bzrlib.commands and options are
48
43
    # normally loaded, and the rest of loggerhead won't be loaded until serve
49
44
    # --http is run.
50
45
        
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
 
 
 
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'
57
55
    DEFAULT_PORT = 8080
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
 
                path = kw.get('directory', '.')
80
 
                port = kw.get('port', DEFAULT_PORT)
81
 
                # port might be an int already...
82
 
                if isinstance(port, basestring) and ':' in port:
83
 
                    host, port = port.split(':')
 
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
        argv = ['--host', host, '--port', str(port), transport.base]
 
74
        config = LoggerheadConfig(argv)
 
75
        app = BranchesFromTransportRoot(transport, config)
 
76
        app = HTTPExceptionHandler(app)
 
77
        serve(app, host=host, port=port)
 
78
 
 
79
    if transport_server_registry is not None:
 
80
        transport_server_registry.register('http', serve_http, help=HELP)
 
81
    else:
 
82
        import bzrlib.builtins
 
83
        from bzrlib.commands import get_cmd_object, register_command
 
84
        from bzrlib.option import Option
 
85
 
 
86
        _original_command = get_cmd_object('serve')
 
87
 
 
88
        class cmd_serve(bzrlib.builtins.cmd_serve):
 
89
            __doc__ = _original_command.__doc__
 
90
 
 
91
            takes_options = _original_command.takes_options + [
 
92
                Option('http', help=HELP)]
 
93
 
 
94
            def run(self, *args, **kw):
 
95
                if 'http' in kw:
 
96
                    from bzrlib.transport import get_transport
 
97
                    path = kw.get('directory', '.')
 
98
                    port = kw.get('port', DEFAULT_PORT)
 
99
                    # port might be an int already...
 
100
                    if isinstance(port, basestring) and ':' in port:
 
101
                        host, port = port.split(':')
 
102
                    else:
 
103
                        host = DEFAULT_HOST
 
104
                    transport = get_transport(path)
 
105
                    serve_http(transport, host, port)
84
106
                else:
85
 
                    host = '0.0.0.0'
86
 
                argv = ['--host', host, '--port', str(port), path]
87
 
                config = LoggerheadConfig(argv)
88
 
                transport = get_transport(path)
89
 
                app = BranchesFromTransportRoot(transport, config)
90
 
                app = HTTPExceptionHandler(app)
91
 
                serve(app, host=host, port=port)
92
 
            else:
93
 
                super(cmd_serve, self).run(*args, **kw)
 
107
                    super(cmd_serve, self).run(*args, **kw)
94
108
 
95
 
    register_command(cmd_serve)
 
109
        register_command(cmd_serve)