summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2015-02-22 14:54:35 -0500
committerPatrick Uiterwijk <puiterwijk@redhat.com>2015-02-24 16:58:25 +0100
commit86636e61cb8b61dda9943d667cb0ce0934b4bdb9 (patch)
treeb003094ccdbde95612d96ebf010060f94e8ee27e
parentc89ae23656dceecba453c68ce97382b9fff5fda6 (diff)
downloadipsilon-86636e61cb8b61dda9943d667cb0ce0934b4bdb9.tar.gz
ipsilon-86636e61cb8b61dda9943d667cb0ce0934b4bdb9.tar.xz
ipsilon-86636e61cb8b61dda9943d667cb0ce0934b4bdb9.zip
Do not crash on failure to load config
Just report an error and continue with default values. Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
-rw-r--r--ipsilon/util/plugin.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py
index bacff4b..1035ca8 100644
--- a/ipsilon/util/plugin.py
+++ b/ipsilon/util/plugin.py
@@ -183,7 +183,11 @@ class PluginObject(Log):
def refresh_plugin_config(self):
config = self.get_plugin_config()
if config:
- self.import_config(config)
+ try:
+ self.import_config(config)
+ except Exception, e: # pylint: disable=broad-except
+ self.error('Failed to refresh config for %s (%s)' %
+ (self.name, e))
def save_plugin_config(self, config=None):
if config is None: