Skip to content

Commit

Permalink
Switch to 2-method approach
Browse files Browse the repository at this point in the history
  • Loading branch information
todd committed Dec 13, 2022
1 parent bb799b8 commit 6e7825b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dashboard/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def strategy():

def visible_on_lan() -> bool:
config = get_control_config()
visible = config.get_element("dashboard_visible_on_lan", default="False")
visible = config.get_element_or_default("dashboard_visible_on_lan", False)

visible = str2Bool(visible)

Expand Down
2 changes: 1 addition & 1 deletion sysbrokers/broker_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def get_broker_class_list(data: dataBlob):
"""
config = data.config

broker_factory_func = config.get_element('broker_factory_func', default=get_ib_class_list)
broker_factory_func = config.get_element_or_default('broker_factory_func', get_ib_class_list)

get_class_list = resolve_function(broker_factory_func)

Expand Down
16 changes: 10 additions & 6 deletions sysdata/config/configdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,22 @@ def add_single_element(self, element_name):
elements.append(element_name)
self._elements = elements

def get_element(self, element_name, default=None):
if default is None:
def get_element(self, element_name):
try:
result = getattr(self, element_name)
else:
result = getattr(self, element_name, default)
except AttributeError:
raise missingData("Missing config element %s" % element_name)
return result

def get_element_or_default(self, element_name, default):
result = getattr(self, element_name, default)
return result

def get_element_or_missing_data(self, element_name):
return self.get_element(element_name, default=missing_data)
return self.get_element_or_default(element_name, missing_data)

def get_element_or_arg_not_supplied(self, element_name):
return self.get_element(element_name, default=arg_not_supplied)
return self.get_element_or_default(element_name, arg_not_supplied)

def __repr__(self):
elements = self.elements
Expand Down

0 comments on commit 6e7825b

Please sign in to comment.