← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to start-loggerhead

[rs=mwhudson] Merge from trunk, 1.6 release.

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(home, 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
 
    log_folder = os.path.join(home, 'logs')
51
50
    if not os.path.exists(log_folder):
52
51
        os.mkdir(log_folder)
53
52
 
76
75
 
77
76
 
78
77
def main():
79
 
    parser = OptionParser(usage='usage: %prog [options]', version='%prog ' + release.version)
 
78
    home = os.path.realpath(os.path.dirname(__file__))
 
79
    default_pidfile = os.path.join(home, 'loggerhead.pid')
 
80
    default_configfile = os.path.join(home, 'loggerhead.conf')
 
81
    default_log_folder = os.path.join(home, 'logs')
 
82
    parser = OptionParser(usage='usage: %prog [options]', version='%prog')
80
83
    parser.add_option('-f', '--foreground', action='store_true', dest='foreground', default=False,
81
84
                      help="run in the foreground; don't daemonize")
82
85
    parser.add_option('-C', '--check', action='store_true', dest='check', default=False,
83
86
                      help="only start if not already running (useful for cron jobs)")
 
87
    parser.add_option('-p', '--pidfile', dest="pidfile", default=default_pidfile,
 
88
                      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,
 
92
                      type=str, help="override log file directory")
84
93
    options, args = parser.parse_args()
85
94
    if len(args) > 0:
86
95
        parser.error('No filename arguments are used, only options.')
87
96
 
88
 
 
89
 
    home = os.path.realpath(os.path.dirname(__file__))
90
 
    pidfile = os.path.join(home, 'loggerhead.pid')
91
 
 
92
97
    if options.check:
93
 
        if daemon.is_running(pidfile):
 
98
        if daemon.is_running(options.pidfile):
94
99
            sys.exit(0)
95
 
        sys.stderr.write('Did not find loggerhead running in %r; restarting...\n' % (pidfile,))
 
100
        sys.stderr.write('Did not find loggerhead running in %r; restarting...\n' % (options.pidfile,))
96
101
 
97
102
    # read loggerhead config
98
103
 
99
 
    config = ConfigObj(os.path.join(home, 'loggerhead.conf'), encoding='utf-8')
 
104
    config = ConfigObj(options.configfile, encoding='utf-8')
100
105
    extra_path = config.get('bzrpath', None)
101
106
    if extra_path:
102
107
        sys.path.insert(0, extra_path)
103
108
 
104
 
    #turbogears.update_config(configfile="dev.cfg", modulename="loggerhead.config")
105
 
 
106
109
    potential_overrides = [ ('server.socket_port', int),
107
110
                            ('server.webpath', str),
108
111
                            ('server.thread_pool', int),
116
119
        value = config.get(key, None)
117
120
        if value is not None:
118
121
            value = keytype(value)
119
 
            #turbogears.config.update({ key: value })
120
122
 
121
123
    if not options.foreground:
122
124
        sys.stderr.write('\n')
123
125
        sys.stderr.write('Launching loggerhead into the background.\n')
124
 
        sys.stderr.write('PID file: %s\n' % (pidfile,))
 
126
        sys.stderr.write('PID file: %s\n' % (options.pidfile,))
125
127
        sys.stderr.write('\n')
126
128
 
127
 
        daemon.daemonize(pidfile, home)
 
129
        daemon.daemonize(options.pidfile, home)
128
130
 
129
 
    setup_logging(home, config, foreground=options.foreground)
 
131
    setup_logging(options.log_folder, config, foreground=options.foreground)
130
132
 
131
133
    log = logging.getLogger('loggerhead')
132
134
    log.info('Starting up...')
151
153
    finally:
152
154
        log.info('Shutdown.')
153
155
        try:
154
 
            os.remove(pidfile)
 
156
            os.remove(options.pidfile)
155
157
        except OSError:
156
158
            pass
157
159