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

psi: improve sea interface

Browse Source 
- get return value from teh frappy-config script in order
  to detect failures
- call config_check not more than once within 1 sec

Change-Id: Ibe42e846521206463f2761d452aea7e558a36854
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32139
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2023-09-13 18:16:51 +02:00
parent af34fef1e1
commit bf4b3e5683
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frappy_psi/sea.py
View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# ***************************************************************************** # *****************************************************************************
# This program is free software; you can redistribute it and/or modify it under # This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software # the terms of the GNU General Public License as published by the Free Software
@ -185,8 +184,9 @@ class SeaClient(ProxyClient, Module):
break break
else: else:
raise CommunicationFailedError('reply %r should be "Login OK"' % reply) raise CommunicationFailedError('reply %r should be "Login OK"' % reply)
self.request('frappy_config %s %s' % (self.service, self.config)) result = self.request('frappy_config %s %s' % (self.service, self.config))
if result not in {'0', '1'}:
raise CommunicationFailedError(f'reply from frappy_config: {result}')
# frappy_async_client switches to the json protocol (better for updates) # frappy_async_client switches to the json protocol (better for updates)
self.asynio.writeline(b'frappy_async_client') self.asynio.writeline(b'frappy_async_client')
self.asynio.writeline(('get_all_param ' + ' '.join(self.objects)).encode()) self.asynio.writeline(('get_all_param ' + ' '.join(self.objects)).encode())
@ -248,7 +248,16 @@ class SeaClient(ProxyClient, Module):
raise TimeoutError('no response within 10s') raise TimeoutError('no response within 10s')
def _rxthread(self, started_callback): def _rxthread(self, started_callback):
recheck = None
while not self.shutdown: while not self.shutdown:
if recheck and time.time() > recheck:
# try to collect device changes within 1 sec
recheck = None
result = self.request('check_config %s %s' % (self.service, self.config))
if result == '1':
self.asynio.writeline(('get_all_param ' + ' '.join(self.objects)).encode())
else:
self.DISPATCHER.shutdown()
try: try:
reply = self.asynio.readline() reply = self.asynio.readline()
if reply is None: if reply is None:
@ -307,11 +316,7 @@ class SeaClient(ProxyClient, Module):
if mplist is None: if mplist is None:
if path.startswith('/device'): if path.startswith('/device'):
if path == '/device/changetime': if path == '/device/changetime':
result = self.request('check_config %s %s' % (self.service, self.config)) recheck = time.time() + 1
if result == '1':
self.asynio.writeline(('get_all_param ' + ' '.join(self.objects)).encode())
else:
self.DISPATCHER.shutdown()
elif path.startswith('/device/frappy_%s' % self.service) and value == '': elif path.startswith('/device/frappy_%s' % self.service) and value == '':
self.DISPATCHER.shutdown() self.DISPATCHER.shutdown()
else: else: