Throw an error when scan_timeout config is not loaded.

This commit is contained in:
Tobias Sauerwein 2013-08-01 09:31:44 +02:00
parent 3c6a0543f5
commit dee0d01e20

View File

@ -98,9 +98,9 @@ def main():
logging.debug('Debug info for %s: %s', uri, debug) logging.debug('Debug info for %s: %s', uri, debug)
if not config['local']['scan_timeout']: if not config['local']['scan_timeout']:
scan_timeout = 1000 self.error_callback(uri, 'Config value local/scan_timeout is not set.', 'debug')
else:
scan_timeout = config['local']['scan_timeout'] scan_timeout = config['local']['scan_timeout']
logging.info('Scanning new and modified tracks.') logging.info('Scanning new and modified tracks.')
# TODO: just pass the library in instead? # TODO: just pass the library in instead?
@ -262,7 +262,7 @@ class Scanner(object):
def process_timeout(self): def process_timeout(self):
if self.error_callback: if self.error_callback:
uri = self.uribin.get_property('uri') uri = self.uribin.get_property('uri')
self.error_callback(uri, 'Processing timeout after %i seconds' % self.timeout, 'debug') self.error_callback(uri, 'Processing timeout after %i seconds' % self.scan_timeout, 'debug')
self.next_uri() self.next_uri()
return True return True