linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frappy.modulebase: fix missing update after error on parameter

Browse Source
This commit is contained in:
l_samenv 2024-06-11 08:08:42 +02:00
parent 5a54503fe7
commit a44f3fae50
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frappy/client/__init__.py
View File

@ -260,7 +260,6 @@ class ProxyClient:
cblist = self.callbacks[cbname].get(key, [])
for cbfunc in list(cblist):
try:
# print("CALLBACK", cbname, repr(key), *args)
cbfunc(*args)
except UnregisterCallback:
cblist.remove(cbfunc)
@ -495,8 +494,6 @@ class SecopClient(ProxyClient):
return
if self.activate:
self.log.info('try to reconnect to %s', self.uri)
if self._connthread:
print('WARN connthread is still there')
self._connthread = mkthread(self._reconnect)
else:
self.log.warning('%s disconnected', self.uri)
@ -513,15 +510,11 @@ class SecopClient(ProxyClient):
def _reconnect(self, connected_callback=None):
while not self._shutdown.is_set():
try:
# print('_reconnect_connect')
self.connect()
# print('_reconnect_success')
if connected_callback:
connected_callback()
# print('_reconnect_break')
break
except Exception as e:
# print('_reconnect_exc', e)
txt = str(e).split('\n', 1)[0]
if txt != self._last_error:
self._last_error = txt

2
frappy/modulebase.py
View File

@ -524,7 +524,7 @@ class Module(HasAccessibles):
except Exception as e:
err = e
else:
changed = pobj.value != value
changed = pobj.value != value or pobj.readerror
# store the value even in case of error
pobj.value = value
if err:

22
frappy/proxy.py
View File

@ -31,9 +31,6 @@ from frappy.io import HasIO
DISCONNECTED = Readable.Status.ERROR, 'disconnected'
ACTIVATING = Readable.Status.IDLE, 'activating'
CONNECTED = Readable.Status.IDLE, 'connected'
CONN_STATI = {DISCONNECTED, ACTIVATING, CONNECTED}
class ProxyModule(HasIO, Module):
@ -41,6 +38,7 @@ class ProxyModule(HasIO, Module):
status = Parameter('connection status', Readable.status.datatype) # add status even when not a Readable
_consistency_check_done = False
_connection_status = None # status when not connected
_secnode = None
enablePoll = False
@ -51,6 +49,8 @@ class ProxyModule(HasIO, Module):
def updateEvent(self, module, parameter, value, timestamp, readerror):
if parameter not in self.parameters:
return # ignore unknown parameters
if parameter == 'status' and not readerror:
self._connection_status = None
# should be done here: deal with clock differences
self.announceUpdate(parameter, value, readerror, timestamp)
@ -115,21 +115,17 @@ class ProxyModule(HasIO, Module):
def nodeStateChange(self, online, state):
if online:
if state == 'activating':
self.status = ACTIVATING
else:
if not self._consistency_check_done:
self._check_descriptive_data()
self._consistency_check_done = True
if self.status[0] in CONN_STATI:
# avoid overriding remote status
self.status = CONNECTED
if not self._consistency_check_done:
self._check_descriptive_data()
self._consistency_check_done = True
if self._connection_status:
self.status = Readable.Status.IDLE, state
else:
readerror = CommunicationFailedError('disconnected')
if self.status != DISCONNECTED:
for pname in set(self.parameters) - set(('module', 'status')):
self.announceUpdate(pname, None, readerror)
self.status = DISCONNECTED
self.status = self._connection_status = DISCONNECTED
def checkProperties(self):
pass # skip