Merge Master in geni-v3 conflict resolution

[sfa.git] / sfa / managers / managerwrapper.py

diff --git a/sfa/managers/managerwrapper.py b/sfa/managers/managerwrapper.py
index 86907e7..946f7d2 100644 (file)
--- a/sfa/managers/managerwrapper.py
+++ b/sfa/managers/managerwrapper.py
@@ -15,15 +15,18 @@ class ManagerWrapper:
     is not implemented by a libarary and will generally be more helpful than
     the standard AttributeError         
     """
-    def __init__(self, manager, interface):
+    def __init__(self, manager, interface, config):
         if isinstance (manager, ModuleType):
             # old-fashioned module implementation
             self.manager = manager
         elif isinstance (manager, ClassType):
             # create an instance; we don't pass the api in argument as it is passed 
             # to the actual method calls anyway
-            self.manager = manager()
+            self.manager = manager(config)
         else:
+            # that's what happens when there's something wrong with the db
+            # or any bad stuff of that kind at startup time
+            logger.log_exc("Failed to create a manager, startup sequence is broken")
             raise SfaAPIError,"Argument to ManagerWrapper must be a module or class"
         self.interface = interface