From 3cfdcb481e4944d2c1227e4a5855505d973a31ab Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 14 May 2019 11:41:35 +0000
Subject: [PATCH] SW-699: Use default bus
---
MAC/Services/src/observation_control_rpc.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/MAC/Services/src/observation_control_rpc.py b/MAC/Services/src/observation_control_rpc.py
index cf10fa50c0d..393863b3131 100644
--- a/MAC/Services/src/observation_control_rpc.py
+++ b/MAC/Services/src/observation_control_rpc.py
@@ -21,7 +21,8 @@
import logging
from lofar.messaging.RPC import RPCWrapper
-from lofar.mac.config import DEFAULT_OBSERVATION_CONTROL_BUS_NAME, DEFAULT_OBSERVATION_CONTROL_SERVICE_NAME
+from lofar.messaging import DEFAULT_BROKER, DEFAULT_BUSNAME
+from lofar.mac.config import DEFAULT_OBSERVATION_CONTROL_SERVICE_NAME
''' Simple RPC client for Service ObservationControl2
'''
@@ -31,9 +32,9 @@ logger = logging.getLogger(__name__)
class ObservationControlRPCClient(RPCWrapper):
def __init__(self,
- busname=DEFAULT_OBSERVATION_CONTROL_BUS_NAME,
+ busname=DEFAULT_BUSNAME,
servicename=DEFAULT_OBSERVATION_CONTROL_SERVICE_NAME,
- broker=None,
+ broker=DEFAULT_BROKER,
timeout=120):
super(ObservationControlRPCClient, self).__init__(busname, servicename, broker, timeout=timeout)
--
GitLab