h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

refactor: replace usage of instance manager method with cmd_sysctl_manage function

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-05-25 18:42:20 +02:00
parent 91162a7070
commit aafcba9f40
6 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kiauh/components/klipper/klipper_remove.py
View File

@@ -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:

3
kiauh/components/klipper/klipper_setup.py
View File

@@ -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)

3
kiauh/components/moonraker/moonraker_remove.py
View File

@@ -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:

3
kiauh/components/moonraker/moonraker_setup.py
View File

@@ -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

11
kiauh/core/instance_manager/instance_manager.py
View File

@@ -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

2
kiauh/extensions/telegram_bot/moonraker_telegram_bot_extension.py
View File

@@ -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():