3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update_manager: deprecate repo debug option 

Use the "debug" command line option to enable debug
features for the update manager.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-10-07 07:36:13 -04:00 committed by Eric Callahan
parent 1e8c7f0915
commit 485b29490a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moonraker/components/machine.py
View File

@ -1522,9 +1522,12 @@ class InstallValidator:
self._link_data_file(key_dest, ssl_key) self._link_data_file(key_dest, ssl_key)
cfg_source.remove_option("server", "ssl_key_path") cfg_source.remove_option("server", "ssl_key_path")
# Remove deprecated debug option # Remove deprecated debug options
if server_cfg.has_option("enable_debug_logging"): if server_cfg.has_option("enable_debug_logging"):
cfg_source.remove_option("server", "enable_debug_logging") cfg_source.remove_option("server", "enable_debug_logging")
um_cfg = server_cfg["update_manager"]
if um_cfg.has_option("enable_repo_debug"):
cfg_source.remove_option("update_manager", "enable_repo_debug")
except Exception: except Exception:
cfg_source.cancel() cfg_source.cancel()
raise raise

4
moonraker/components/update_manager/update_manager.py
View File

@ -464,8 +464,8 @@ class CommandHelper:
self.server = config.get_server() self.server = config.get_server()
self.http_client: HttpClient self.http_client: HttpClient
self.http_client = self.server.lookup_component("http_client") self.http_client = self.server.lookup_component("http_client")
self.debug_enabled = config.getboolean('enable_repo_debug', False) config.getboolean('enable_repo_debug', False, deprecate=True)
if self.debug_enabled: if self.server.is_debug_enabled():
logging.warning("UPDATE MANAGER: REPO DEBUG ENABLED") logging.warning("UPDATE MANAGER: REPO DEBUG ENABLED")
shell_cmd: SCMDComp = self.server.lookup_component('shell_command') shell_cmd: SCMDComp = self.server.lookup_component('shell_command')
self.scmd_error = shell_cmd.error self.scmd_error = shell_cmd.error