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

client: fix how to raise error on wrong ident

Browse Source 
leftover error_map from long ago, turned into direct raising of
HardwareError

Change-Id: I8772e20133502bb0a997d5317a74e2bd16b780c6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34279
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
This commit is contained in:
Alexander Zaft 2024-07-31 14:52:01 +02:00 committed by Markus Zolliker
parent 6e1cd30678
commit a7fc1e4342
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
frappy/client/__init__.py
View File

@ -22,23 +22,24 @@
# ***************************************************************************** # *****************************************************************************
"""general SECoP client""" """general SECoP client"""
import re
import json import json
import queue import queue
import re
import time import time
from collections import defaultdict from collections import defaultdict
from threading import Event, RLock, current_thread from threading import Event, RLock, current_thread
import frappy.params import frappy.params
from frappy.errors import make_secop_error, SECoPError, WrongTypeError
from frappy.datatypes import get_datatype from frappy.datatypes import get_datatype
from frappy.errors import HardwareError, SECoPError, WrongTypeError, \
make_secop_error
from frappy.lib import mkthread from frappy.lib import mkthread
from frappy.lib.asynconn import AsynConn, ConnectionClosed from frappy.lib.asynconn import AsynConn, ConnectionClosed
from frappy.protocol.interface import decode_msg, encode_msg_frame from frappy.protocol.interface import decode_msg, encode_msg_frame
from frappy.protocol.messages import COMMANDREQUEST, \ from frappy.protocol.messages import COMMANDREQUEST, DESCRIPTIONREQUEST, \
DESCRIPTIONREQUEST, ENABLEEVENTSREQUEST, ERRORPREFIX, \ ENABLEEVENTSREQUEST, ERRORPREFIX, EVENTREPLY, HEARTBEATREQUEST, \
EVENTREPLY, HEARTBEATREQUEST, IDENTPREFIX, IDENTREQUEST, \ IDENTPREFIX, IDENTREQUEST, READREPLY, READREQUEST, REQUEST2REPLY, \
READREPLY, READREQUEST, REQUEST2REPLY, WRITEREPLY, WRITEREQUEST WRITEREPLY, WRITEREQUEST
# replies to be handled for cache # replies to be handled for cache
UPDATE_MESSAGES = {EVENTREPLY, READREPLY, WRITEREPLY, ERRORPREFIX + READREQUEST, ERRORPREFIX + EVENTREPLY} UPDATE_MESSAGES = {EVENTREPLY, READREPLY, WRITEREPLY, ERRORPREFIX + READREQUEST, ERRORPREFIX + EVENTREPLY}
@ -269,7 +270,7 @@ class ProxyClient:
e.args = [f'error in callback {cbname}{args}: {e}'] e.args = [f'error in callback {cbname}{args}: {e}']
self.callback(None, 'handleError', e) self.callback(None, 'handleError', e)
except Exception: except Exception:
pass pass
return bool(cblist) return bool(cblist)
def updateValue(self, module, param, value, timestamp, readerror): def updateValue(self, module, param, value, timestamp, readerror):
@ -352,10 +353,10 @@ class SecopClient(ProxyClient):
if reply: if reply:
self.secop_version = reply.decode('utf-8') self.secop_version = reply.decode('utf-8')
else: else:
raise self.error_map('HardwareError')(f'no answer to {IDENTREQUEST}') raise HardwareError(f'no answer to {IDENTREQUEST}')
if not VERSIONFMT.match(self.secop_version): if not VERSIONFMT.match(self.secop_version):
raise self.error_map('HardwareError')(f'bad answer to {IDENTREQUEST}: {self.secop_version!r}') raise HardwareError(f'bad answer to {IDENTREQUEST}: {self.secop_version!r}')
# inform that the other party still uses a legacy identifier # inform that the other party still uses a legacy identifier
# see e.g. Frappy Bug #4659 (https://forge.frm2.tum.de/redmine/issues/4659) # see e.g. Frappy Bug #4659 (https://forge.frm2.tum.de/redmine/issues/4659)
if not self.secop_version.startswith(IDENTPREFIX): if not self.secop_version.startswith(IDENTPREFIX):
@ -491,8 +492,8 @@ class SecopClient(ProxyClient):
self._rxthread = None self._rxthread = None
self.disconnect(shutdown) self.disconnect(shutdown)
if self._shutdown.is_set(): if self._shutdown.is_set():
return pass
if self.activate: elif self.activate:
self.log.info('try to reconnect to %s', self.uri) self.log.info('try to reconnect to %s', self.uri)
self._connthread = mkthread(self._reconnect) self._connthread = mkthread(self._reconnect)
else: else: