followup fix for 37776: remove Secnode.raise_config_errors
use raise_config_errors from generalConfig Change-Id: I5c05edee452540ddc0401f47b375335690d29e54 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37935 Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch> Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de> Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
This commit is contained in:
@@ -38,8 +38,6 @@ class SecNode:
|
|||||||
- get_module(modulename) returns the requested module or None if there is
|
- get_module(modulename) returns the requested module or None if there is
|
||||||
no suitable configuration on the server
|
no suitable configuration on the server
|
||||||
"""
|
"""
|
||||||
raise_config_errors = False # collect catchable errors instead of raising
|
|
||||||
|
|
||||||
def __init__(self, name, logger, options, srv):
|
def __init__(self, name, logger, options, srv):
|
||||||
self.equipment_id = options.pop('equipment_id', name)
|
self.equipment_id = options.pop('equipment_id', name)
|
||||||
self.nodeprops = {}
|
self.nodeprops = {}
|
||||||
@@ -177,7 +175,7 @@ class SecNode:
|
|||||||
try:
|
try:
|
||||||
getattr(modobj, prop)
|
getattr(modobj, prop)
|
||||||
except SECoPError as e:
|
except SECoPError as e:
|
||||||
if self.raise_config_errors:
|
if generalConfig.raise_config_errors:
|
||||||
raise
|
raise
|
||||||
self.error_count += 1
|
self.error_count += 1
|
||||||
modobj.logError(e)
|
modobj.logError(e)
|
||||||
|
|||||||
Reference in New Issue
Block a user