← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to start-loggerhead

  • Committer: Michael Hudson
  • Date: 2008-09-29 21:36:59 UTC
  • mfrom: (217.1.17 logging)
  • Revision ID: michael.hudson@canonical.com-20080929213659-gvxmf9s1e2zouetn
Guillermo Gonzalez's logging branch, which mostly cleans up how errors are
reported, both in terms of logging and in the browser.
Some clean ups by me.

Show diffs side-by-side

added added

removed removed

Lines of Context:
start-loggerhead
31
31
 
32
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', 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
 
 
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__))
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)