~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Matt Nordhoff
  • Date: 2009-05-04 16:10:22 UTC
  • mto: This revision was merged to the branch mainline in revision 341.
  • Revision ID: mnordhoff@mattnordhoff.com-20090504161022-8w6h4d9jqm32wezh
Add NEWS entries for a couple new things

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#
2
 
# Copyright (C) 2008, 2009 Canonical Ltd
3
 
#
 
1
#!/usr/bin/env python
4
2
# This program is free software; you can redistribute it and/or modify
5
3
# it under the terms of the GNU General Public License as published by
6
4
# the Free Software Foundation; either version 2 of the License, or
22
20
import sys
23
21
 
24
22
from bzrlib.plugin import load_plugins
25
 
from bzrlib.transport import get_transport
26
23
 
27
24
from paste import httpserver
28
25
from paste.httpexceptions import HTTPExceptionHandler, HTTPInternalServerError
29
26
from paste.translogger import TransLogger
30
27
 
31
28
from loggerhead import __version__
32
 
from loggerhead.apps.transport import (
33
 
    BranchesFromTransportRoot, UserBranchesFromTransportRoot)
 
29
from loggerhead.apps.filesystem import (
 
30
    BranchesFromFileSystemRoot, UserBranchesFromFileSystemRoot)
34
31
from loggerhead.config import LoggerheadConfig
35
32
from loggerhead.util import Reloader
36
33
from loggerhead.apps.error import ErrorHandlerApp
37
34
 
38
35
 
39
 
def get_config_and_path(args):
40
 
    config = LoggerheadConfig(args)
 
36
def main(args):
 
37
    config = LoggerheadConfig()
41
38
 
42
39
    if config.get_option('show_version'):
43
40
        print "loggerhead %s" % __version__
47
44
        config.print_help()
48
45
        sys.exit(1)
49
46
    elif config.arg_count == 1:
50
 
        base = config.get_arg(0)
51
 
    else:
52
 
        base = '.'
53
 
 
54
 
    if not config.get_option('allow_writes'):
55
 
        base = 'readonly+' + base
56
 
 
57
 
    return config, base
58
 
 
59
 
 
60
 
def setup_logging(config):
 
47
        path = config.get_arg(0)
 
48
    else:
 
49
        path = '.'
 
50
 
 
51
    if not os.path.isdir(path):
 
52
        print "%s is not a directory" % path
 
53
        sys.exit(1)
 
54
 
 
55
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
 
56
        print "--trunk-dir is only valid with --user-dirs"
 
57
        sys.exit(1)
 
58
 
 
59
    if config.get_option('reload'):
 
60
        if Reloader.is_installed():
 
61
            Reloader.install()
 
62
        else:
 
63
            return Reloader.restart_with_reloader()
 
64
 
 
65
    if config.get_option('user_dirs'):
 
66
        if not config.get_option('trunk_dir'):
 
67
            print "You didn't specify a directory for the trunk directories."
 
68
            sys.exit(1)
 
69
        app = UserBranchesFromFileSystemRoot(path, config)
 
70
    else:
 
71
        app = BranchesFromFileSystemRoot(path, config)
 
72
 
 
73
    # setup_logging()
61
74
    logging.basicConfig()
62
75
    logging.getLogger('').setLevel(logging.DEBUG)
63
 
    logger = logging.getLogger('loggerhead')
 
76
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
64
77
    if config.get_option('log_folder'):
65
78
        logfile_path = os.path.join(
66
79
            config.get_option('log_folder'), 'serve-branches.log')
72
85
    logfile.setFormatter(formatter)
73
86
    logfile.setLevel(logging.DEBUG)
74
87
    logger.addHandler(logfile)
75
 
    return logger
76
 
 
77
 
 
78
 
def make_app_for_config_and_path(config, base):
79
 
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
80
 
        print "--trunk-dir is only valid with --user-dirs"
81
 
        sys.exit(1)
82
 
 
83
 
    if config.get_option('reload'):
84
 
        if Reloader.is_installed():
85
 
            Reloader.install()
86
 
        else:
87
 
            return Reloader.restart_with_reloader()
88
 
 
89
 
    if config.get_option('user_dirs'):
90
 
        if not config.get_option('trunk_dir'):
91
 
            print "You didn't specify a directory for the trunk directories."
92
 
            sys.exit(1)
93
 
        app = UserBranchesFromTransportRoot(base, config)
94
 
    else:
95
 
        app = BranchesFromTransportRoot(base, config)
96
 
 
97
 
    setup_logging(config)
98
 
 
 
88
 
 
89
    # setup_logging() #end
 
90
 
 
91
    app = TransLogger(app, logger=logger)
99
92
    if config.get_option('profile'):
100
93
        from loggerhead.middleware.profile import LSProfMiddleware
101
94
        app = LSProfMiddleware(app)
130
123
 
131
124
    app = HTTPExceptionHandler(app)
132
125
    app = ErrorHandlerApp(app)
133
 
    app = TransLogger(app, logger=logging.getLogger('loggerhead'))
134
 
 
135
 
    return app
136
 
 
137
 
 
138
 
def main(args):
139
 
    load_plugins()
140
 
 
141
 
    config, path = get_config_and_path(args)
142
 
 
143
 
    app = make_app_for_config_and_path(config, path)
144
126
 
145
127
    if not config.get_option('user_port'):
146
128
        port = '8080'
152
134
    else:
153
135
        host = config.get_option('user_host')
154
136
 
 
137
    load_plugins()
 
138
 
155
139
    httpserver.serve(app, host=host, port=port)
 
140
 
 
141
 
 
142
if __name__ == "__main__":
 
143
    main(sys.argv)