X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fmanagerwrapper.py;h=77af9bf6fdc89b436b3d84ac0b43f3781235b0e7;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=b0326d67d0cce0af059c6f56aaad275dac9c97c4;hpb=1957f8a717df2e893da2f840ec0e811f570beddf;p=sfa.git

diff --git a/sfa/managers/managerwrapper.py b/sfa/managers/managerwrapper.py
index b0326d67..77af9bf6 100644
--- a/sfa/managers/managerwrapper.py
+++ b/sfa/managers/managerwrapper.py
@@ -4,6 +4,8 @@ from sfa.util.faults import SfaNotImplemented, SfaAPIError
 from sfa.util.sfalogging import logger
 
 ####################
+
+
 class ManagerWrapper:
     """
     This class acts as a wrapper around an SFA interface manager module, but
@@ -15,20 +17,25 @@ class ManagerWrapper:
     is not implemented by a libarary and will generally be more helpful than
     the standard AttributeError         
     """
-    def __init__(self, manager, interface):
-        if isinstance (manager, ModuleType):
+
+    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 
+        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:
-            raise SfaAPIError,"Argument to ManagerWrapper must be a module or class"
+            # 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
-        
+
     def __getattr__(self, method):
         if not hasattr(self.manager, method):
-            raise SfaNotImplemented(method, self.interface)
+            raise SfaNotImplemented(self.interface, method)
         return getattr(self.manager, method)
-