diff --git a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestmomadapter.py b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestmomadapter.py index 11e100a14be070046a2c698b26d573d243e76242..9a5f369dd8fab3731634cb9b6eaa550bfca98aad 100644 --- a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestmomadapter.py +++ b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestmomadapter.py @@ -59,6 +59,7 @@ class IngestMomAdapter: mom_busname=DEFAULT_MOMQUERY_BUSNAME, mom_servicename=DEFAULT_MOMQUERY_SERVICENAME, broker=None, + mom_broker=None, **kwargs): self.__momClient = momClient @@ -71,10 +72,12 @@ class IngestMomAdapter: self.__notification_prefix = notification_publish_prefix self.__event_bus = ToBus(notification_publish_busname, broker=broker) - self.__momrpc = MoMQueryRPC(servicename=mom_servicename, busname=mom_busname, broker=broker, timeout=180) - self.__job_queue = ToBus(job_queue_name, broker=broker) + if not mom_broker: + mom_broker = broker + self.__momrpc = MoMQueryRPC(servicename=mom_servicename, busname=mom_busname, broker=mom_broker, timeout=180) + try: logger.info('Setting up MoM SOAP server on %s:%s', mom_xmlrpc_host, mom_xmlrpc_port) self._server = SOAPpy.SOAPServer((mom_xmlrpc_host, mom_xmlrpc_port)) @@ -269,6 +272,7 @@ def main(): parser.add_option('--mom_query_servicename', dest='mom_query_servicename', type='string', default=DEFAULT_MOMQUERY_SERVICENAME, help='Name of the momqueryservice, default: %default') + parser.add_option('--mom_query_service_broker', dest='mom_query_service_broker', type='string', default='scu001.control.lofar', help='Address of the qpid broker where the mom query service runs, default: %default') parser.add_option("-m", "--mom_credentials", dest="mom_credentials", type="string", default='MoM_site' if isProductionEnvironment() else 'MoM_site_test', @@ -303,7 +307,8 @@ def main(): mom_xmlrpc_port=options.port, mom_busname=options.mom_query_busname, mom_servicename=options.mom_query_servicename, - broker=options.broker) + broker=options.broker, + mom_broker=options.mom_query_service_broker) adapter.run() logger.info('Stopped IngestMomAdapter')