also allow for daemon in the config file so that we can test it easier

This commit is contained in:
Jason Kölker 2011-06-15 10:42:50 -05:00
parent e201d6baf9
commit 71174b6575

View File

@ -63,10 +63,11 @@ if __name__ == '__main__':
create_options(oparser)
(options, args) = config.parse_options(oparser)
daemon = options.get('daemon')
try:
conf, app = config.load_paste_app('glance-scrubber', options, args)
daemon = options.get('daemon') or \
config.get_option(conf, 'daemon', type='bool',
default=False)
if daemon:
wakeup_time = int(conf.get('wakeup_time', 300))