From 36eacba0465ce4a1a69ada916b1598bd8a693ecf Mon Sep 17 00:00:00 2001 From: reiche Date: Tue, 9 Jan 2024 11:21:37 +0100 Subject: [PATCH] Corrected the ZMQ base class inherited by the ServerBase Class --- util/__init__.py | 4 +++- util/serverbase.py | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/util/__init__.py b/util/__init__.py index 31dccc0..7d06df8 100644 --- a/util/__init__.py +++ b/util/__init__.py @@ -1,2 +1,4 @@ -from .serverbase import ServerBase from .zmqbase import ZMQBase +from .serverbase import ServerBase + + diff --git a/util/serverbase.py b/util/serverbase.py index 9fa7e0c..80bc3e4 100644 --- a/util/serverbase.py +++ b/util/serverbase.py @@ -9,9 +9,10 @@ from datetime import datetime import time from epics import PV -import ZMQBase +sys.path.append('/sf/bd/packages/sfbd') +from sfbd.util import ZMQBase -class ServerBase (ZMQBase): +class ServerBase(ZMQBase): def __init__(self, root = 'MyServer', debug = False, WDServer = '127.0.0.1', WDPort = 5678): super(ServerBase,self).__init__(WDServer,WDPort) @@ -53,13 +54,13 @@ class ServerBase (ZMQBase): self.PVlog = PV('%s:LOG%s' % (self.root,self.suffix)) def stop(self,pvname=None,value=None,**kws): - self.logger.info('PV:STOP triggered at %s' % datetime.now().strftime('%Y-%m-%d %H:%M:%S')) if value > 0: + self.logger.info('PV:STOP triggered at %s' % datetime.now().strftime('%Y-%m-%d %H:%M:%S')) self.running=False def start(self): self.logger.info('Starting Server: %s at %s' % (self.root,datetime.now().strftime('%Y-%m-%d %H:%M:%S'))) - self.logger.info('PV Root: %s' % self.root + self.logger.info('PV Root: %s' % self.root) self.logger.info('Version: %s' % self.version) self.logger.info('Host: %s' % self.host) self.logger.info('PID: %d' % self.pid)