← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to start-loggerhead

merge peter's changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
start-loggerhead
23
23
import sys
24
24
import urlparse
25
25
 
26
 
from configobj import ConfigObj
 
26
from bzrlib.plugin import load_plugins
 
27
from bzrlib.util.configobj.configobj import ConfigObj
27
28
 
28
29
from paste import httpserver
29
30
from paste.httpexceptions import make_middleware
31
32
 
32
33
from loggerhead import daemon
33
34
from loggerhead.apps.config import Root
34
 
 
35
 
 
36
 
def make_handler(config, filename):
37
 
    roll = config.get('log.roll', 'never')
38
 
    if roll == 'daily':
39
 
        h = logging.handlers.TimedRotatingFileHandler(filename, 'midnight', 1, 100)
40
 
    elif roll == 'weekly':
41
 
        h = logging.handlers.TimedRotatingFileHandler(filename, 'W0', 1, 100)
42
 
    else:
43
 
        h = logging.FileHandler(filename)
44
 
    return h
45
 
 
46
 
 
47
 
def setup_logging(log_folder, config, foreground):
48
 
    # i hate that stupid logging config format, so just set up logging here.
49
 
 
50
 
    if not os.path.exists(log_folder):
51
 
        os.mkdir(log_folder)
52
 
 
53
 
    f = logging.Formatter('%(levelname)-.3s [%(asctime)s.%(msecs)03d] %(name)s: %(message)s',
54
 
                          '%Y%m%d-%H:%M:%S')
55
 
    debug_log = make_handler(config, os.path.join(log_folder, 'debug.log'))
56
 
    debug_log.setLevel(logging.DEBUG)
57
 
    debug_log.setFormatter(f)
58
 
    if foreground:
59
 
        stdout_log = logging.StreamHandler(sys.stdout)
60
 
        stdout_log.setLevel(logging.DEBUG)
61
 
        stdout_log.setFormatter(f)
62
 
    f = logging.Formatter('[%(asctime)s.%(msecs)03d] %(message)s',
63
 
                          '%Y%m%d-%H:%M:%S')
64
 
    access_log = make_handler(config, os.path.join(log_folder, 'access.log'))
65
 
    access_log.setLevel(logging.INFO)
66
 
    access_log.setFormatter(f)
67
 
 
68
 
    logging.getLogger('').setLevel(logging.DEBUG)
69
 
    logging.getLogger('').addHandler(debug_log)
70
 
    logging.getLogger('wsgi').addHandler(access_log)
71
 
 
72
 
    if foreground:
73
 
        logging.getLogger('').addHandler(stdout_log)
74
 
 
 
35
from loggerhead.trace import make_handler, setup_logging
 
36
from loggerhead.apps.error import ErrorHandlerApp
75
37
 
76
38
 
77
39
def main():
80
42
    default_configfile = os.path.join(home, 'loggerhead.conf')
81
43
    default_log_folder = os.path.join(home, 'logs')
82
44
    parser = OptionParser(usage='usage: %prog [options]', version='%prog')
83
 
    parser.add_option('-f', '--foreground', action='store_true', dest='foreground', default=False,
 
45
    parser.add_option('-f', '--foreground',
 
46
                      action='store_true', dest='foreground', default=False,
84
47
                      help="run in the foreground; don't daemonize")
85
 
    parser.add_option('-C', '--check', action='store_true', dest='check', default=False,
86
 
                      help="only start if not already running (useful for cron jobs)")
87
 
    parser.add_option('-p', '--pidfile', dest="pidfile", default=default_pidfile,
 
48
    parser.add_option('-C', '--check', action='store_true',
 
49
                      dest='check', default=False,
 
50
                      help=("only start if not already running (useful for "
 
51
                            "cron jobs)"))
 
52
    parser.add_option('-p', '--pidfile', dest="pidfile",
 
53
                      default=default_pidfile,
88
54
                      type=str, help="override pidfile location")
89
 
    parser.add_option('-c', '--config-file', dest="configfile", default=default_configfile,
90
 
                                          type=str, help="override configuration file location")
91
 
    parser.add_option('-L', '--log-folder', dest="log_folder", default=default_log_folder,
 
55
    parser.add_option('-c', '--config-file', dest="configfile",
 
56
                      default=default_configfile,
 
57
                      type=str, help="override configuration file location")
 
58
    parser.add_option('-L', '--log-folder', dest="log_folder",
 
59
                      default=default_log_folder,
92
60
                      type=str, help="override log file directory")
93
61
    options, args = parser.parse_args()
94
62
    if len(args) > 0:
97
65
    if options.check:
98
66
        if daemon.is_running(options.pidfile):
99
67
            sys.exit(0)
100
 
        sys.stderr.write('Did not find loggerhead running in %r; restarting...\n' % (options.pidfile,))
 
68
        sys.stderr.write('Did not find loggerhead running in %r;' % (
 
69
                         options.pidfile))
 
70
        sys.stderr.write(' restarting...\n')
101
71
 
102
72
    # read loggerhead config
103
73
 
106
76
    if extra_path:
107
77
        sys.path.insert(0, extra_path)
108
78
 
109
 
    potential_overrides = [ ('server.socket_port', int),
110
 
                            ('server.webpath', str),
111
 
                            ('server.thread_pool', int),
112
 
                            ('server.socket_host' ,str) ]
 
79
    potential_overrides = [('server.socket_port', int),
 
80
                           ('server.webpath', str),
 
81
                           ('server.thread_pool', int),
 
82
                           ('server.socket_host', str)]
113
83
    server_port = int(config.get('server.socket_port', 8080))
114
84
    nworkers = int(config.get('server.thread_pool', 10))
115
85
    server_host = config.get('server.socket_host', '0.0.0.0')
123
93
    if not options.foreground:
124
94
        sys.stderr.write('\n')
125
95
        sys.stderr.write('Launching loggerhead into the background.\n')
126
 
        sys.stderr.write('PID file: %s\n' % (options.pidfile,))
 
96
        sys.stderr.write('PID file: %s\n' % options.pidfile)
127
97
        sys.stderr.write('\n')
128
98
 
129
99
        daemon.daemonize(options.pidfile, home)
137
107
 
138
108
    app = app
139
109
    app = make_middleware(app)
140
 
    app = make_filter(app, None)
 
110
    app = make_filter(app, None, logger_name=log.name+'.access')
 
111
    app = ErrorHandlerApp(app)
141
112
 
142
113
    if webpath:
143
114
        scheme, netloc, path, blah, blah, blah = urlparse.urlparse(webpath)
 
115
 
144
116
        def app(environ, start_response, orig=app):
145
117
            environ['SCRIPT_NAME'] = path
146
118
            environ['HTTP_HOST'] = netloc
 
119
            environ['wsgi.url_scheme'] = scheme
147
120
            return orig(environ, start_response)
148
121
 
 
122
    load_plugins()
 
123
 
149
124
    try:
150
125
        httpserver.serve(
151
126
            app, host=server_host, port=server_port,