← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

[rs=mwhudson] upgrade to loggerhead trunk, mostly to better support IE

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
19
19
import os
20
20
import sys
21
21
 
22
 
from optparse import OptionParser
23
 
 
24
22
from bzrlib.plugin import load_plugins
25
23
 
26
24
from paste import httpserver
30
28
from loggerhead import __version__
31
29
from loggerhead.apps.filesystem import (
32
30
    BranchesFromFileSystemRoot, UserBranchesFromFileSystemRoot)
 
31
from loggerhead.config import LoggerheadConfig
33
32
from loggerhead.util import Reloader
34
33
from loggerhead.apps.error import ErrorHandlerApp
35
34
 
36
35
 
37
 
def command_line_parser():
38
 
    parser = OptionParser("%prog [options] <path>")
39
 
    parser.set_defaults(
40
 
        user_dirs=False,
41
 
        show_version=False,
42
 
        log_folder=None,
43
 
        )
44
 
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
45
 
                      help="Serve user directories as ~user.")
46
 
    parser.add_option("--trunk-dir", metavar="DIR",
47
 
                      help="The directory that contains the trunk branches.")
48
 
    parser.add_option("--port", dest="user_port",
49
 
                      help=("Port Loggerhead should listen on "
50
 
                            "(defaults to 8080)."))
51
 
    parser.add_option("--host", dest="user_host",
52
 
                      help="Host Loggerhead should listen on.")
53
 
    parser.add_option("--prefix", dest="user_prefix",
54
 
                      help="Specify host prefix.")
55
 
    parser.add_option("--profile", action="store_true", dest="profile",
56
 
                      help="Generate callgrind profile data to "
57
 
                        "%d-stats.callgrind on each request.")
58
 
    parser.add_option("--reload", action="store_true", dest="reload",
59
 
                      help="Restarts the application when changing python"
60
 
                           " files. Only used for development purposes.")
61
 
    parser.add_option('--log-folder', dest="log_folder",
62
 
                      type=str, help="The directory to place log files in.")
63
 
    parser.add_option("--version", action="store_true", dest="show_version",
64
 
                      help="Print the software version and exit")
65
 
    return parser
66
 
 
67
 
 
68
36
def main(args):
69
 
    parser = command_line_parser()
70
 
    (options, args) = parser.parse_args(sys.argv[1:])
 
37
    config = LoggerheadConfig()
71
38
 
72
 
    if options.show_version:
 
39
    if config.get_option('show_version'):
73
40
        print "loggerhead %s" % __version__
74
41
        sys.exit(0)
75
42
 
76
 
    if len(args) > 1:
77
 
        parser.print_help()
 
43
    if config.arg_count > 1:
 
44
        config.print_help()
78
45
        sys.exit(1)
79
 
    elif len(args) == 1:
80
 
        [path] = args
 
46
    elif config.arg_count == 1:
 
47
        path = config.get_arg(0)
81
48
    else:
82
49
        path = '.'
83
50
 
85
52
        print "%s is not a directory" % path
86
53
        sys.exit(1)
87
54
 
88
 
    if options.trunk_dir and not options.user_dirs:
 
55
    if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
89
56
        print "--trunk-dir is only valid with --user-dirs"
90
57
        sys.exit(1)
91
58
 
92
 
    if options.reload:
 
59
    if config.get_option('reload'):
93
60
        if Reloader.is_installed():
94
61
            Reloader.install()
95
62
        else:
96
63
            return Reloader.restart_with_reloader()
97
64
 
98
 
    if options.user_dirs:
99
 
        if not options.trunk_dir:
 
65
    if config.get_option('user_dirs'):
 
66
        if not config.get_option['trunk_dir']:
100
67
            print "You didn't specify a directory for the trunk directories."
101
68
            sys.exit(1)
102
 
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
 
69
        app = UserBranchesFromFileSystemRoot(
 
70
            path, config.get_option('trunk_dir'))
103
71
    else:
104
72
        app = BranchesFromFileSystemRoot(path)
105
73
 
107
75
    logging.basicConfig()
108
76
    logging.getLogger('').setLevel(logging.DEBUG)
109
77
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
110
 
    if options.log_folder:
111
 
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
 
78
    if config.get_option('log_folder'):
 
79
        logfile_path = os.path.join(
 
80
            config.get_option['log_folder'], 'serve-branches.log')
112
81
    else:
113
82
        logfile_path = 'serve-branches.log'
114
83
    logfile = logging.FileHandler(logfile_path, 'a')
117
86
    logfile.setFormatter(formatter)
118
87
    logfile.setLevel(logging.DEBUG)
119
88
    logger.addHandler(logfile)
 
89
 
 
90
    if config.get_option('memory_profile'):
 
91
        memprofile = logging.getLogger('loggerhead-memprofile')
 
92
        memprofile.setLevel(logging.DEBUG)
 
93
        memprofile.addHandler(logging.FileHandler('loggerhead-memprofile'))
 
94
 
120
95
    # setup_logging() #end
 
96
 
121
97
    app = TransLogger(app, logger=logger)
122
 
    if options.profile:
 
98
    if config.get_option('profile'):
123
99
        from loggerhead.middleware.profile import LSProfMiddleware
124
100
        app = LSProfMiddleware(app)
 
101
    if config.get_option('memory_profile'):
 
102
        from loggerhead.middleware.profile import MemoryProfileMiddleware
 
103
        app = MemoryProfileMiddleware(app)
125
104
 
126
 
    if not options.user_prefix:
 
105
    if not config.get_option('user_prefix'):
127
106
        prefix = '/'
128
107
    else:
129
 
        prefix = options.user_prefix
 
108
        prefix = config.get_option('user_prefix')
130
109
        if not prefix.startswith('/'):
131
110
            prefix = '/' + prefix
132
111
 
151
130
    app = HTTPExceptionHandler(app)
152
131
    app = ErrorHandlerApp(app)
153
132
 
154
 
    if not options.user_port:
 
133
    if not config.get_option('user_port'):
155
134
        port = '8080'
156
135
    else:
157
 
        port = options.user_port
 
136
        port = config.get_option('user_port')
158
137
 
159
 
    if not options.user_host:
 
138
    if not config.get_option('user_host'):
160
139
        host = '0.0.0.0'
161
140
    else:
162
 
        host = options.user_host
 
141
        host = config.get_option('user_host')
163
142
 
164
143
    load_plugins()
165
144