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

[WIP] use get_server_state instead of propose_cfgs

Browse Source
This commit is contained in:
zolliker
2023-10-17 11:02:27 +02:00
parent 0edda9f5c8
commit 45fd71077c
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
devices.py
View File

@ -174,11 +174,11 @@ class FrappyConfig(Device):
for a potential "please consider calling frappy(...)" message for a potential "please consider calling frappy(...)" message
""" """
proposed, overview = FrappyManager().propose_cfgs(config.instrument, cfgs) error, proposed, state, info = FrappyManager().get_server_state(config.instrument, cfgs)
for service, guess in list(proposed.items()): for service, guess in list(proposed.items()):
if guess is True: if guess is True:
proposed.pop(service) proposed.pop(service)
return proposed, overview return proposed, state, info
def check_services(self): def check_services(self):
cfgs = {} cfgs = {}
@ -308,18 +308,29 @@ class FrappyConfig(Device):
raise TypeError('refuse to override plugged device') raise TypeError('refuse to override plugged device')
self.show_config(self.start_services(main, stick, addons)) self.show_config(self.start_services(main, stick, addons))
def show_config(self, allcfg, show_server_state=False): def show_config(self, allcfg, show_server_state=False, giventitle='nicos'):
proposed, overview = self.to_consider(allcfg) proposed, state, info = self.to_consider(allcfg)
if show_server_state == 'auto': if show_server_state == 'auto':
show_server_state = overview != self._previous_shown show_server_state = state != self._previous_shown
if show_server_state: if show_server_state:
for line in overview: givencfgs, remarks = info
session.log.info('%s', line) frappycfgs, seacfgs = state
rows = [['', giventitle, 'frappy', 'sea', '']]
for key, remark in remarks.items():
rows.append([key if key in ('main', 'stick') else 'addon',
givencfgs.get(key, ''), frappycfgs.get(key, ''),
seacfgs.get(key, ''), remark])
wid = [max(len(v) for v in column) for column in zip(*rows)]
# insert title underlines
rows.insert(1, [''] + ['-' * w for w in wid[1:-1]] + [''])
for row in rows:
session.log.info('%s', ' '.join(v.ljust(w) for w, v in zip(wid, row)))
session.log.info('')
# remove 'frappy.has_changed()' commands in script queue # remove 'frappy.has_changed()' commands in script queue
controller = session.daemon_device._controller controller = session.daemon_device._controller
controller.block_requests(r['reqid'] for r in controller.get_queue() controller.block_requests(r['reqid'] for r in controller.get_queue()
if r['script'].startswith('frappy.has_changed()')) if r['script'].startswith('frappy.has_changed()'))
self._previous_shown = overview self._previous_shown = state
session.log.info(all_info(allcfg)) session.log.info(all_info(allcfg))
if proposed: if proposed:
@ -359,10 +370,10 @@ class FrappyConfig(Device):
cfgs['stick'] = running_stick cfgs['stick'] = running_stick
else: else:
cfgs.pop('stick', None) cfgs.pop('stick', None)
proposed, overview = fm.propose_cfgs(config.instrument, cfgs) error, proposed, state, info = fm.get_server_state(config.instrument, cfgs, True)
self._initial_config = proposed or {} if not error:
if proposed is not None: self._initial_config = proposed
self._previous_shown = overview # otherwise the server state will be shown on startup self._previous_shown = state # otherwise the server state will be shown on startup
return self._initial_config.get(service) return self._initial_config.get(service)
def has_changed(self, show_server_state='auto'): def has_changed(self, show_server_state='auto'):