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

fix generalConfig defaults

Browse Source 
bin/frappy-server:
- the default for omit_unchanged_within must not be overriden
+ remove no longer used disable_value_range_check

Change-Id: I5c0620e44dc7df3ae2ca48f7ab6371189acae489
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30727
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-03-21 09:02:35 +01:00
parent 361f9ac4fc
commit 79277e86f1
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/frappy-server
View File

@ -90,8 +90,9 @@ def main(argv=None):
args = parseArgv(argv[1:]) args = parseArgv(argv[1:])
loglevel = 'debug' if args.verbose else ('error' if args.quiet else 'info') loglevel = 'debug' if args.verbose else ('error' if args.quiet else 'info')
generalConfig.defaults = {k: args.relaxed for k in ( generalConfig.set_default('lazy_number_validation', args.relaxed)
'lazy_number_validation', 'disable_value_range_check', 'legacy_hasiodev', 'tolerate_poll_property')} generalConfig.set_default('legacy_hasiodev', args.relaxed)
generalConfig.set_default('tolerate_poll_property', args.relaxed)
generalConfig.init(args.gencfg) generalConfig.init(args.gencfg)
logger.init(loglevel) logger.init(loglevel)

2
frappy/params.py
View File

@ -291,11 +291,9 @@ class Parameter(Accessible):
if modobj: if modobj:
if self.update_unchanged == -1: if self.update_unchanged == -1:
t = modobj.omit_unchanged_within t = modobj.omit_unchanged_within
print(self, t)
self.omit_unchanged_within = generalConfig.omit_unchanged_within if t is None else t self.omit_unchanged_within = generalConfig.omit_unchanged_within if t is None else t
else: else:
self.omit_unchanged_within = float(self.update_unchanged) self.omit_unchanged_within = float(self.update_unchanged)
print(self, self.omit_unchanged_within, generalConfig.defaults, generalConfig._config)
def export_value(self): def export_value(self):
return self.datatype.export_value(self.value) return self.datatype.export_value(self.value)