diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py index 067b174a5467f4efaa6c95c2ca72c4938369325d..c299f86989f8efca70505537d3ce4b185b379887 100755 --- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py +++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py @@ -44,19 +44,13 @@ class RATaskStatusChangedListener(RABusListener): def __init__(self, busname=DEFAULT_BUSNAME, broker=DEFAULT_BROKER, - propagator=None, ## TODO also give translator? - **kwargs): + propagator=None): """ RATaskScheduledListener listens on the lofar ?? bus and calls onTaskScheduled or onTaskConclict :param busname: valid Qpid address (default: lofar.ra.notification) :param broker: valid Qpid broker host (default: None, which means localhost) - additional parameters in kwargs: - options= <dict> Dictionary of options passed to QPID - exclusive= <bool> Create an exclusive binding so no other services can consume duplicate messages (default: False) - numthreads= <int> Number of parallel threads processing messages (default: 1) - verbose= <bool> Output extra logging over stdout (default: False) """ - super(RATaskStatusChangedListener, self).__init__(busname=busname, broker=broker, **kwargs) + super(RATaskStatusChangedListener, self).__init__(busname=busname, broker=broker) self.propagator = propagator if not self.propagator: diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/raservice.py b/SAS/ResourceAssignment/ResourceAssigner/lib/raservice.py index 14251cf495b5008d5af80ff90be7201aebb9aab2..6fb9cdc0a296999ad618a4266109a4f56019c995 100755 --- a/SAS/ResourceAssignment/ResourceAssigner/lib/raservice.py +++ b/SAS/ResourceAssignment/ResourceAssigner/lib/raservice.py @@ -42,19 +42,13 @@ class SpecifiedTaskListener(RATaskSpecifiedBusListener): def __init__(self, busname=DEFAULT_BUSNAME, broker=DEFAULT_BROKER, - assigner=None, - **kwargs): + assigner=None): """ SpecifiedTaskListener listens on the lofar ?? bus and calls onTaskSpecified :param busname: valid Qpid address (default: lofar.otdb.status) :param broker: valid Qpid broker host (default: None, which means localhost) - additional parameters in kwargs: - options= <dict> Dictionary of options passed to QPID - exclusive= <bool> Create an exclusive binding so no other services can consume duplicate messages (default: False) - numthreads= <int> Number of parallel threads processing messages (default: 1) - verbose= <bool> Output extra logging over stdout (default: False) """ - super(SpecifiedTaskListener, self).__init__(busname=busname, broker=broker, **kwargs) + super(SpecifiedTaskListener, self).__init__(busname=busname, broker=broker) self.assigner = assigner if not self.assigner: diff --git a/SAS/TriggerEmailService/Server/lib/TriggerEmailService.py b/SAS/TriggerEmailService/Server/lib/TriggerEmailService.py index e39fae718043373e98d4f103eb1921d5c420ddf3..b63900bd2d756034a82630f5f3dc7e813e668dd8 100644 --- a/SAS/TriggerEmailService/Server/lib/TriggerEmailService.py +++ b/SAS/TriggerEmailService/Server/lib/TriggerEmailService.py @@ -79,8 +79,8 @@ class MoMIdError(Exception): class OTDBTriggerListener(OTDBBusListener): - def __init__(self, momquery_rpc=MoMQueryRPC(), busname=DEFAULT_BUSNAME, broker=DEFAULT_BROKER, **kwargs): - super(OTDBTriggerListener, self).__init__(busname=busname, broker=broker, **kwargs) + def __init__(self, momquery_rpc=MoMQueryRPC(), busname=DEFAULT_BUSNAME, broker=DEFAULT_BROKER): + super(OTDBTriggerListener, self).__init__(busname=busname, broker=broker) self.mom_rpc_client = momquery_rpc