Merge lp:~stefanor/ibid/handle-plugin-setup-failure-726022 into lp:ibid

[Stefano Rivera]

Catch Exceptions during Processor instantiation, rather than aborting an entire plugin load ecause of an exception

A single Processor that won't load shouldn't make a plugin unloadable.

[Jonathan Hitchcock (vhata)]

:+1:

review: Approve

=== modified file 'ibid/core.py'
--- ibid/core.py	2011-02-27 11:03:47 +0000
+++ ibid/core.py	2012-07-23 22:42:26 +0000
@@ -235,23 +235,29 @@
                 self.log.exception(u"Couldn't load %s plugin", name)
             return False
 
-        try:
-            for classname, klass in inspect.getmembers(m, inspect.isclass):
-                if issubclass(klass, ibid.plugins.Processor) and klass != ibid.plugins.Processor:
-                    if (klass.__name__ not in noload and (klass.__name__ in load
-                            or ((load_all or klass.autoload) and not noload_all))):
-                        self.log.debug("Loading Processor: %s.%s", name, klass.__name__)
+        for classname, klass in inspect.getmembers(m, inspect.isclass):
+            if (issubclass(klass, ibid.plugins.Processor)
+                    and klass != ibid.plugins.Processor):
+                if (klass.__name__ not in noload and (klass.__name__ in load
+                        or ((load_all or klass.autoload) and not noload_all))):
+                    self.log.debug("Loading Processor: %s.%s", name,
+                                   klass.__name__)
+                    try:
                         ibid.processors.append(klass(name))
-                    else:
-                        self.log.debug("Skipping Processor: %s.%s", name, klass.__name__)
+                    except Exception, e:
+                        self.log.exception(u"Couldn't instantiate %s "
+                                           u"processor of %s plugin",
+                                           classname, name)
+                        continue
+                else:
+                    self.log.debug("Skipping Processor: %s.%s", name,
+                                   klass.__name__)
 
-            try:
-                schema_version_check(ibid.databases['ibid'])
-            except SchemaVersionException, e:
-                self.log.error(u'Tables out of date: %s. Run "ibid-db --upgrade"', e.message)
-        except Exception, e:
-            self.log.exception(u"Couldn't instantiate %s processor of %s plugin", classname, name)
-            return False
+        try:
+            schema_version_check(ibid.databases['ibid'])
+        except SchemaVersionException, e:
+            self.log.error(u'Tables out of date: %s. Run "ibid-db --upgrade"',
+                           e.message)
 
         ibid.processors.sort(key=lambda x: x.priority)