← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to start-loggerhead

  • Committer: Jelmer Vernooij
  • Date: 2008-08-06 18:39:15 UTC
  • mto: (197.1.9 pathargs)
  • mto: This revision was merged to the branch mainline in revision 202.
  • Revision ID: jelmer@samba.org-20080806183915-81q0zlnxq57s0egb
Add --pidfile option to stop-loggerhead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
start-loggerhead
44
44
    return h
45
45
 
46
46
 
47
 
def setup_logging(home, config, foreground):
 
47
def setup_logging(logdir, 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():
 
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')
79
82
    parser = OptionParser(usage='usage: %prog [options]', version='%prog ' + release.version)
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
                      help="override pidfile location")
 
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")
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)
121
126
    if not options.foreground:
122
127
        sys.stderr.write('\n')
123
128
        sys.stderr.write('Launching loggerhead into the background.\n')
124
 
        sys.stderr.write('PID file: %s\n' % (pidfile,))
 
129
        sys.stderr.write('PID file: %s\n' % (options.pidfile,))
125
130
        sys.stderr.write('\n')
126
131
 
127
 
        daemon.daemonize(pidfile, home)
 
132
        daemon.daemonize(options.pidfile, home)
128
133
 
129
 
    setup_logging(home, config, foreground=options.foreground)
 
134
    setup_logging(options.log_folder, config, foreground=options.foreground)
130
135
 
131
136
    log = logging.getLogger('loggerhead')
132
137
    log.info('Starting up...')
151
156
    finally:
152
157
        log.info('Shutdown.')
153
158
        try:
154
 
            os.remove(pidfile)
 
159
            os.remove(options.pidfile)
155
160
        except OSError:
156
161
            pass
157
162