X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fgeneric%2F__init__.py;h=de1a9e141476acfa411d66698152f64edf5c28a3;hb=da768be8e74e4b77796fa6e65a7b6b34112ad6dc;hp=98248be249259e3bde528a506d57155b3893936d;hpb=57c390a504d4f9ae424de29a9a694aa26e5ff981;p=sfa.git

diff --git a/sfa/generic/__init__.py b/sfa/generic/__init__.py
index 98248be2..de1a9e14 100644
--- a/sfa/generic/__init__.py
+++ b/sfa/generic/__init__.py
@@ -60,15 +60,18 @@ class Generic:
         if not 'interface' in kwargs:
             logger.critical("Generic.make_api: no interface found")
         api = self.api_class()(*args, **kwargs)
-        manager = self.make_manager(api.interface)
+        # xxx can probably drop support for managers implemented as modules 
+        # which makes it a bit awkward
+        manager_class_or_module = self.make_manager(api.interface)
         driver = self.make_driver (api.config, api.interface)
         ### arrange stuff together
         # add a manager wrapper
-        manager_wrap = ManagerWrapper(manager,api.interface)
+        manager_wrap = ManagerWrapper(manager_class_or_module,api.interface,api.config)
         api.manager=manager_wrap
         # insert driver in manager
-        logger.debug("Setting manager.driver, manager=%s"%manager)
-        manager.driver=driver
+        logger.debug("Setting manager.driver, manager=%s"%manager_class_or_module)
+        # xxx this should go into the object and not the class !?!
+        manager_class_or_module.driver=driver
         # add it in api as well for convenience
         api.driver=driver
         return api