From aafcba9f40b1b71e50b88949cce3b269e551714d Mon Sep 17 00:00:00 2001 From: dw-0 Date: Sat, 25 May 2024 18:42:20 +0200 Subject: [PATCH] refactor: replace usage of instance manager method with cmd_sysctl_manage function Signed-off-by: Dominik Willner --- kiauh/components/klipper/klipper_remove.py | 3 ++- kiauh/components/klipper/klipper_setup.py | 3 ++- kiauh/components/moonraker/moonraker_remove.py | 3 ++- kiauh/components/moonraker/moonraker_setup.py | 3 ++- kiauh/core/instance_manager/instance_manager.py | 11 ----------- .../telegram_bot/moonraker_telegram_bot_extension.py | 2 +- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/kiauh/components/klipper/klipper_remove.py b/kiauh/components/klipper/klipper_remove.py index ad5f30b..8e8eca8 100644 --- a/kiauh/components/klipper/klipper_remove.py +++ b/kiauh/components/klipper/klipper_remove.py @@ -17,6 +17,7 @@ from core.instance_manager.instance_manager import InstanceManager from utils.fs_utils import remove_file from utils.input_utils import get_selection_input from utils.logger import Logger +from utils.sys_utils import cmd_sysctl_manage def run_klipper_removal( @@ -92,7 +93,7 @@ def remove_instances( instance_manager.disable_instance() instance_manager.delete_instance() - instance_manager.reload_daemon() + cmd_sysctl_manage("daemon-reload") def remove_klipper_dir() -> None: diff --git a/kiauh/components/klipper/klipper_setup.py b/kiauh/components/klipper/klipper_setup.py index 21e013a..9f23259 100644 --- a/kiauh/components/klipper/klipper_setup.py +++ b/kiauh/components/klipper/klipper_setup.py @@ -41,6 +41,7 @@ from utils.git_utils import git_clone_wrapper, git_pull_wrapper from utils.input_utils import get_confirm from utils.logger import Logger from utils.sys_utils import ( + cmd_sysctl_manage, create_python_venv, install_python_requirements, parse_packages_from_file, @@ -92,7 +93,7 @@ def install_klipper() -> None: if count == install_count: break - kl_im.reload_daemon() + cmd_sysctl_manage("daemon-reload") except Exception as e: Logger.print_error(e) diff --git a/kiauh/components/moonraker/moonraker_remove.py b/kiauh/components/moonraker/moonraker_remove.py index 8a64ca0..f3733a8 100644 --- a/kiauh/components/moonraker/moonraker_remove.py +++ b/kiauh/components/moonraker/moonraker_remove.py @@ -18,6 +18,7 @@ from core.instance_manager.instance_manager import InstanceManager from utils.fs_utils import remove_file from utils.input_utils import get_selection_input from utils.logger import Logger +from utils.sys_utils import cmd_sysctl_manage def run_moonraker_removal( @@ -98,7 +99,7 @@ def remove_instances( instance_manager.disable_instance() instance_manager.delete_instance() - instance_manager.reload_daemon() + cmd_sysctl_manage("daemon-reload") def remove_moonraker_dir() -> None: diff --git a/kiauh/components/moonraker/moonraker_setup.py b/kiauh/components/moonraker/moonraker_setup.py index b14e658..9546cf6 100644 --- a/kiauh/components/moonraker/moonraker_setup.py +++ b/kiauh/components/moonraker/moonraker_setup.py @@ -44,6 +44,7 @@ from utils.input_utils import ( from utils.logger import Logger from utils.sys_utils import ( check_python_version, + cmd_sysctl_manage, create_python_venv, install_python_requirements, parse_packages_from_file, @@ -110,7 +111,7 @@ def install_moonraker() -> None: mr_im.start_instance() - mr_im.reload_daemon() + cmd_sysctl_manage("daemon-reload") # if mainsail is installed, and we installed # multiple moonraker instances, we enable mainsails remote mode diff --git a/kiauh/core/instance_manager/instance_manager.py b/kiauh/core/instance_manager/instance_manager.py index 4cf3ea4..205d280 100644 --- a/kiauh/core/instance_manager/instance_manager.py +++ b/kiauh/core/instance_manager/instance_manager.py @@ -157,17 +157,6 @@ class InstanceManager: self.current_instance = instance self.stop_instance() - def reload_daemon(self) -> None: - Logger.print_status("Reloading systemd manager configuration ...") - try: - command = ["sudo", "systemctl", "daemon-reload"] - if subprocess.run(command, check=True): - Logger.print_ok("Systemd manager configuration reloaded") - except subprocess.CalledProcessError as e: - Logger.print_error("Error reloading systemd manager configuration:") - Logger.print_error(f"{e}") - raise - def find_instances(self) -> List[T]: from utils.common import convert_camelcase_to_kebabcase diff --git a/kiauh/extensions/telegram_bot/moonraker_telegram_bot_extension.py b/kiauh/extensions/telegram_bot/moonraker_telegram_bot_extension.py index e6c5e74..f2a900d 100644 --- a/kiauh/extensions/telegram_bot/moonraker_telegram_bot_extension.py +++ b/kiauh/extensions/telegram_bot/moonraker_telegram_bot_extension.py @@ -196,7 +196,7 @@ class TelegramBotExtension(BaseExtension): instance_manager.disable_instance() instance_manager.delete_instance() - instance_manager.reload_daemon() + cmd_sysctl_manage("daemon-reload") def _remove_bot_dir(self) -> None: if not TELEGRAM_BOT_DIR.exists():