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

improve error handling in SecopClient

Browse Source 
- catch more errors
- improve behaviour on closing connections

Change-Id: I3e2ed1b3b01b8151bb709d5a3735716742e0eec6
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23123
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2020-05-20 16:12:07 +02:00
parent a25cb3dce5
commit 3261e5e5ff
1 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
secop/client/__init__.py
View File

@ -292,8 +292,9 @@ class SecopClient(ProxyClient):
def __rxthread(self): def __rxthread(self):
noactivity = 0 noactivity = 0
while self._running:
try: try:
while self._running:
# may raise ConnectionClosed
reply = self.io.readline() reply = self.io.readline()
if reply is None: if reply is None:
noactivity += 1 noactivity += 1
@ -301,8 +302,6 @@ class SecopClient(ProxyClient):
# send ping to check if the connection is still alive # send ping to check if the connection is still alive
self.queue_request(HEARTBEATREQUEST, str(noactivity)) self.queue_request(HEARTBEATREQUEST, str(noactivity))
continue continue
except ConnectionClosed:
break
noactivity = 0 noactivity = 0
action, ident, data = decode_msg(reply) action, ident, data = decode_msg(reply)
if ident == '.': if ident == '.':
@ -325,7 +324,10 @@ class SecopClient(ProxyClient):
value = data[0] value = data[0]
readerror = None readerror = None
module, param = module_param module, param = module_param
try:
self.updateValue(module, param, value, timestamp, readerror) self.updateValue(module, param, value, timestamp, readerror)
except KeyError:
pass # ignore updates of unknown parameters
if action in (EVENTREPLY, ERRORPREFIX + EVENTREPLY): if action in (EVENTREPLY, ERRORPREFIX + EVENTREPLY):
continue continue
try: try:
@ -351,7 +353,10 @@ class SecopClient(ProxyClient):
# let the TX thread sort out which entry to treat # let the TX thread sort out which entry to treat
# this may have bad performance, but happens rarely # this may have bad performance, but happens rarely
self.txq.put(self.pending.get()) self.txq.put(self.pending.get())
except ConnectionClosed:
pass
except Exception as e:
self.log.error('rxthread ended with %s' % e)
self._rxthread = None self._rxthread = None
self.disconnect(False) self.disconnect(False)
if self._shutdown: if self._shutdown:
@ -409,6 +414,11 @@ class SecopClient(ProxyClient):
self._connthread.join() self._connthread.join()
self._connthread = None self._connthread = None
self.disconnect_time = time.time() self.disconnect_time = time.time()
try: # make sure txq does not block
while not self.txq.empty():
self.txq.get(False)
except Exception:
pass
if self._txthread: if self._txthread:
self.txq.put(None) # shutdown marker self.txq.put(None) # shutdown marker
self._txthread.join() self._txthread.join()
@ -498,7 +508,7 @@ class SecopClient(ProxyClient):
self.connect() # make sure we are connected self.connect() # make sure we are connected
# the last item is for the reply # the last item is for the reply
entry = [request, Event(), None] entry = [request, Event(), None]
self.txq.put(entry) self.txq.put(entry, timeout=3)
return entry return entry
def get_reply(self, entry): def get_reply(self, entry):