YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

config panels: try to improve the log and error handling: separate ask vs. actual apply

Browse source
This commit is contained in:
Alexandre Aubin 2021-09-05 19:17:17 +02:00
parent ee55b9bf42
commit c5de803531
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/yunohost/app.py
View file

@ -1780,11 +1780,9 @@ def app_config_set(
config_ = AppConfigPanel(app) config_ = AppConfigPanel(app)
Question.operation_logger = operation_logger Question.operation_logger = operation_logger
operation_logger.start()
result = config_.set(key, value, args, args_file) result = config_.set(key, value, args, args_file, operation_logger=operation_logger)
if "errors" not in result:
operation_logger.success()
return result return result

16
src/yunohost/utils/config.py
View file

@ -98,7 +98,7 @@ class ConfigPanel:
return result return result
def set(self, key=None, value=None, args=None, args_file=None): def set(self, key=None, value=None, args=None, args_file=None, operation_logger=None):
self.filter_key = key or "" self.filter_key = key or ""
# Read config panel toml # Read config panel toml
@ -128,11 +128,13 @@ class ConfigPanel:
# Read or get values and hydrate the config # Read or get values and hydrate the config
self._load_current_values() self._load_current_values()
self._hydrate() self._hydrate()
self._ask()
if operation_logger:
operation_logger.start()
try: try:
self._ask()
self._apply() self._apply()
# Script got manually interrupted ... # Script got manually interrupted ...
# N.B. : KeyboardInterrupt does not inherit from Exception # N.B. : KeyboardInterrupt does not inherit from Exception
except (KeyboardInterrupt, EOFError): except (KeyboardInterrupt, EOFError):
@ -158,6 +160,7 @@ class ConfigPanel:
self._reload_services() self._reload_services()
logger.success("Config updated as expected") logger.success("Config updated as expected")
operation_logger.success()
return {} return {}
def _get_toml(self): def _get_toml(self):
@ -211,13 +214,6 @@ class ConfigPanel:
} }
} }
#
# FIXME : this is hella confusing ...
# from what I understand, the purpose is to have some sort of "deep_update"
# to apply the defaults onto the loaded toml ...
# in that case we probably want to get inspiration from
# https://stackoverflow.com/questions/3232943/update-value-of-a-nested-dictionary-of-varying-depth
#
def convert(toml_node, node_type): def convert(toml_node, node_type):
"""Convert TOML in internal format ('full' mode used by webadmin) """Convert TOML in internal format ('full' mode used by webadmin)
Here are some properties of 1.0 config panel in toml: Here are some properties of 1.0 config panel in toml: