← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to start-loggerhead

  • Committer: Martin Albisetti
  • Date: 2008-10-10 19:26:48 UTC
  • mfrom: (218.2.7 loggerhead.empty_branch)
  • Revision ID: martin.albisetti@canonical.com-20081010192648-3ubztpqkk3ky303q
Fix bug #258710, /files page explodes in an empty branch. (Marius Kruger)

Show diffs side-by-side

added added

removed removed

Lines of Context:
start-loggerhead
29
29
from paste.httpexceptions import make_middleware
30
30
from paste.translogger import make_filter
31
31
 
32
 
from loggerhead import daemon, release
 
32
from loggerhead import daemon
33
33
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', 0, 100)
40
 
    elif roll == 'weekly':
41
 
        h = logging.handlers.TimedRotatingFileHandler(filename, 'W0', 0, 100)
42
 
    else:
43
 
        h = logging.FileHandler(filename)
44
 
    return h
45
 
 
46
 
 
47
 
def setup_logging(logdir, 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
 
 
75
 
 
 
34
from loggerhead.trace import make_handler, setup_logging
 
35
from loggerhead.apps.error import ErrorHandlerApp
76
36
 
77
37
def main():
78
38
    home = os.path.realpath(os.path.dirname(__file__))
79
39
    default_pidfile = os.path.join(home, 'loggerhead.pid')
80
40
    default_configfile = os.path.join(home, 'loggerhead.conf')
81
41
    default_log_folder = os.path.join(home, 'logs')
82
 
    parser = OptionParser(usage='usage: %prog [options]', version='%prog ' + release.version)
 
42
    parser = OptionParser(usage='usage: %prog [options]', version='%prog')
83
43
    parser.add_option('-f', '--foreground', action='store_true', dest='foreground', default=False,
84
44
                      help="run in the foreground; don't daemonize")
85
45
    parser.add_option('-C', '--check', action='store_true', dest='check', default=False,
86
46
                      help="only start if not already running (useful for cron jobs)")
87
47
    parser.add_option('-p', '--pidfile', dest="pidfile", default=default_pidfile,
88
 
                      help="override pidfile location")
 
48
                      type=str, help="override pidfile location")
89
49
    parser.add_option('-c', '--config-file', dest="configfile", default=default_configfile,
90
 
                      help="override configuration file location")
91
 
    parser.add_option('-L', '--log-folder', dest="log-folder", default=default_log_folder,
92
 
                      help="override log file directory")
 
50
                                          type=str, help="override configuration file location")
 
51
    parser.add_option('-L', '--log-folder', dest="log_folder", default=default_log_folder,
 
52
                      type=str, help="override log file directory")
93
53
    options, args = parser.parse_args()
94
54
    if len(args) > 0:
95
55
        parser.error('No filename arguments are used, only options.')
137
97
 
138
98
    app = app
139
99
    app = make_middleware(app)
140
 
    app = make_filter(app, None)
 
100
    app = make_filter(app, None, logger_name=log.name+'.access')
 
101
    app = ErrorHandlerApp(app)
141
102
 
142
103
    if webpath:
143
104
        scheme, netloc, path, blah, blah, blah = urlparse.urlparse(webpath)