← 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-12 04:36:13 UTC
  • Revision ID: michael.hudson@canonical.com-20080912043613-d2550i1udbl2g86b
our tests aren't the greatest, but let's keep them passing.

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
34
 
35
35
 
36
36
def make_handler(config, filename):
37
37
    roll = config.get('log.roll', 'never')
38
38
    if roll == 'daily':
39
 
        h = logging.handlers.TimedRotatingFileHandler(filename, 'midnight', 0, 100)
 
39
        h = logging.handlers.TimedRotatingFileHandler(filename, 'midnight', 1, 100)
40
40
    elif roll == 'weekly':
41
 
        h = logging.handlers.TimedRotatingFileHandler(filename, 'W0', 0, 100)
 
41
        h = logging.handlers.TimedRotatingFileHandler(filename, 'W0', 1, 100)
42
42
    else:
43
43
        h = logging.FileHandler(filename)
44
44
    return h
45
45
 
46
46
 
47
 
def setup_logging(logdir, config, foreground):
 
47
def setup_logging(log_folder, config, foreground):
48
48
    # i hate that stupid logging config format, so just set up logging here.
49
49
 
50
50
    if not os.path.exists(log_folder):
79
79
    default_pidfile = os.path.join(home, 'loggerhead.pid')
80
80
    default_configfile = os.path.join(home, 'loggerhead.conf')
81
81
    default_log_folder = os.path.join(home, 'logs')
82
 
    parser = OptionParser(usage='usage: %prog [options]', version='%prog ' + release.version)
 
82
    parser = OptionParser(usage='usage: %prog [options]', version='%prog')
83
83
    parser.add_option('-f', '--foreground', action='store_true', dest='foreground', default=False,
84
84
                      help="run in the foreground; don't daemonize")
85
85
    parser.add_option('-C', '--check', action='store_true', dest='check', default=False,
86
86
                      help="only start if not already running (useful for cron jobs)")
87
87
    parser.add_option('-p', '--pidfile', dest="pidfile", default=default_pidfile,
88
 
                      help="override pidfile location")
 
88
                      type=str, help="override pidfile location")
89
89
    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")
 
90
                                          type=str, help="override configuration file location")
 
91
    parser.add_option('-L', '--log-folder', dest="log_folder", default=default_log_folder,
 
92
                      type=str, help="override log file directory")
93
93
    options, args = parser.parse_args()
94
94
    if len(args) > 0:
95
95
        parser.error('No filename arguments are used, only options.')
106
106
    if extra_path:
107
107
        sys.path.insert(0, extra_path)
108
108
 
109
 
    #turbogears.update_config(configfile="dev.cfg", modulename="loggerhead.config")
110
 
 
111
109
    potential_overrides = [ ('server.socket_port', int),
112
110
                            ('server.webpath', str),
113
111
                            ('server.thread_pool', int),
121
119
        value = config.get(key, None)
122
120
        if value is not None:
123
121
            value = keytype(value)
124
 
            #turbogears.config.update({ key: value })
125
122
 
126
123
    if not options.foreground:
127
124
        sys.stderr.write('\n')