##// END OF EJS Templates
Fixing small bugs in ipcluster stuff....
Brian Granger -
Show More
@@ -32,7 +32,7 b' class IConfiguredObjectFactory(zi.Interface):'
32 subclass of :class:`IPython.config.configurable.Configurable`.
32 subclass of :class:`IPython.config.configurable.Configurable`.
33 """
33 """
34
34
35 def __init__(config):
35 def __init__(config=None):
36 """Get ready to configure the object using config."""
36 """Get ready to configure the object using config."""
37
37
38 def create():
38 def create():
@@ -212,8 +212,8 b' class FCServiceFactory(AdaptedConfiguredObjectFactory):'
212 reuse_furls = Bool(False, config=True)
212 reuse_furls = Bool(False, config=True)
213 interfaces = Instance(klass=Config, kw={}, allow_none=False, config=True)
213 interfaces = Instance(klass=Config, kw={}, allow_none=False, config=True)
214
214
215 def __init__(self, config, adaptee):
215 def __init__(self, config=None, adaptee=None):
216 super(FCServiceFactory, self).__init__(config, adaptee)
216 super(FCServiceFactory, self).__init__(config=config, adaptee=adaptee)
217 self._check_reuse_furls()
217 self._check_reuse_furls()
218
218
219 def _ip_changed(self, name, old, new):
219 def _ip_changed(self, name, old, new):
@@ -225,7 +225,7 b' class IPControllerApp(ApplicationWithClusterDir):'
225 controller_service.setServiceParent(self.main_service)
225 controller_service.setServiceParent(self.main_service)
226 # The client tub and all its refereceables
226 # The client tub and all its refereceables
227 try:
227 try:
228 csfactory = FCClientServiceFactory(self.master_config, controller_service)
228 csfactory = FCClientServiceFactory(config=self.master_config, adaptee=controller_service)
229 except FURLError, e:
229 except FURLError, e:
230 log.err(e)
230 log.err(e)
231 self.exit(0)
231 self.exit(0)
@@ -233,7 +233,7 b' class IPControllerApp(ApplicationWithClusterDir):'
233 client_service.setServiceParent(self.main_service)
233 client_service.setServiceParent(self.main_service)
234 # The engine tub
234 # The engine tub
235 try:
235 try:
236 esfactory = FCEngineServiceFactory(self.master_config, controller_service)
236 esfactory = FCEngineServiceFactory(config=self.master_config, adaptee=controller_service)
237 except FURLError, e:
237 except FURLError, e:
238 log.err(e)
238 log.err(e)
239 self.exit(0)
239 self.exit(0)
General Comments 0
You need to be logged in to leave comments. Login now