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

unify Frappy.show and Frappy.show_state

Browse Source 
+ fix indentation
This commit is contained in:
zolliker
2024-12-03 14:56:50 +01:00
parent 53057297d7
commit 6a89ec8383
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
devices.py
View File

@ -192,7 +192,7 @@ class FrappyConfig(Device):
if busy or fm.state == prev_shown: if busy or fm.state == prev_shown:
continue continue
self._back_to_normal = 0 # indicates that we had a change self._back_to_normal = 0 # indicates that we had a change
self.show_state(True, to_consider) self.show(True, to_consider)
prev_shown = fm.state prev_shown = fm.state
def to_consider(self, cfgs=None): def to_consider(self, cfgs=None):
@ -337,9 +337,6 @@ class FrappyConfig(Device):
self._restarting = False self._restarting = False
return all_cfg return all_cfg
def show(self):
return self(update=False)
def __call__(self, *args, main=None, stick=None, addons=None, force=False, update=True): def __call__(self, *args, main=None, stick=None, addons=None, force=False, update=True):
"""(re)start frappy server(s) with given configs and load setup if needed """(re)start frappy server(s) with given configs and load setup if needed
@ -391,7 +388,7 @@ class FrappyConfig(Device):
if update and need_change: if update and need_change:
self.update() self.update()
else: else:
self.show_state(False, to_consider) self.show(False, to_consider)
return return
if confirmed and main not in (None, 'restart') and confirmed.lower() != main.lower() and not force: if confirmed and main not in (None, 'restart') and confirmed.lower() != main.lower() and not force:
session.log.warning('%r is plugged to the cryostat control rack', confirmed) session.log.warning('%r is plugged to the cryostat control rack', confirmed)
@ -400,7 +397,7 @@ class FrappyConfig(Device):
raise TypeError('refuse to override plugged device') raise TypeError('refuse to override plugged device')
session.log.info(all_info(self.start_services(main, stick, addons))) session.log.info(all_info(self.start_services(main, stick, addons)))
def show_state(self, changes_only=False, consider_result=None): def show(self, changes_only=False, consider_result=None):
need_changes, changes, fm = consider_result or self.to_consider() need_changes, changes, fm = consider_result or self.to_consider()
if need_changes: if need_changes:
session.log.warning('sample environment configuration should be changed:') session.log.warning('sample environment configuration should be changed:')
@ -570,8 +567,8 @@ class FrappyConfig(Device):
continue continue
# determine aliases # determine aliases
for aliasname in aliasnames: for aliasname in aliasnames:
if aliasname not in needed_aliases: if aliasname not in needed_aliases:
needed_aliases[aliasname] = devname needed_aliases[aliasname] = devname
# determine envlist # determine envlist
if aliasnames: if aliasnames:
# only the first item of aliasnames is added to the envlist # only the first item of aliasnames is added to the envlist
@ -588,12 +585,12 @@ class FrappyConfig(Device):
# determine aliases to be changed # determine aliases to be changed
for aliasname, dev in previous_aliases.items(): for aliasname, dev in previous_aliases.items():
target = needed_aliases.get(aliasname) target = needed_aliases.get(aliasname)
if target: if target:
if dev.alias == target: if dev.alias == target:
needed_aliases.pop(aliasname) needed_aliases.pop(aliasname)
else: else:
needed_aliases[aliasname] = None needed_aliases[aliasname] = None
# build new env list. keep order as before # build new env list. keep order as before
addedenv = [v for v in newenv.values()] addedenv = [v for v in newenv.values()]