dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only show log after successful load

Browse Source
This commit is contained in:
Ruud
2014-03-12 22:34:32 +01:00
parent 6a9c3dac77
commit f775c9da0b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/loader.py
+4 -4
View File
@@ -56,12 +56,10 @@ class Loader(object):
if m is None: if m is None:
continue continue
log.info('Loading %s: %s', (plugin['type'], plugin['name']))
# Save default settings for plugin/provider # Save default settings for plugin/provider
did_save += self.loadSettings(m, module_name, save = False) did_save += self.loadSettings(m, module_name, save = False)
self.loadPlugins(m, plugin.get('name')) self.loadPlugins(m, plugin.get('type'), plugin.get('name'))
except ImportError as e: except ImportError as e:
# todo:: subclass ImportError for missing requirements. # todo:: subclass ImportError for missing requirements.
if e.message.lower().startswith("missing"): if e.message.lower().startswith("missing"):
@@ -123,7 +121,7 @@ class Loader(object):
log.debug('Failed loading settings for "%s": %s', (name, traceback.format_exc())) log.debug('Failed loading settings for "%s": %s', (name, traceback.format_exc()))
return False return False
def loadPlugins(self, module, name): def loadPlugins(self, module, type, name):
if not hasattr(module, 'autoload'): if not hasattr(module, 'autoload'):
#log.debug('Skip startup for plugin %s as it has no start section' % module.__file__) #log.debug('Skip startup for plugin %s as it has no start section' % module.__file__)
@@ -135,6 +133,8 @@ class Loader(object):
# Load folder plugin # Load folder plugin
else: else:
module.autoload() module.autoload()
log.info('Loaded %s: %s', (type, name))
return True return True
except: except:
log.error('Failed loading plugin "%s": %s', (module.__file__, traceback.format_exc())) log.error('Failed loading plugin "%s": %s', (module.__file__, traceback.format_exc()))