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

update_manager: fix service restart 

On machines running instances of Moonraker and Klipper without
the default service names it is necessary to look up their unit names
using systemd.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-02-26 15:36:53 -05:00
parent fd5ea0c6a4
commit ead4cc21ce
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
moonraker/components/update_manager/app_deploy.py
View File

@ -25,6 +25,7 @@ from typing import (
) )
if TYPE_CHECKING: if TYPE_CHECKING:
from ...confighelper import ConfigHelper from ...confighelper import ConfigHelper
from ...klippy_connection import KlippyConnection as Klippy
from .update_manager import CommandHelper from .update_manager import CommandHelper
from ..machine import Machine from ..machine import Machine
from ..file_manager.file_manager import FileManager from ..file_manager.file_manager import FileManager
@ -115,6 +116,20 @@ class AppDeploy(BaseDeploy):
services: List[str] = config.getlist( services: List[str] = config.getlist(
"managed_services", svc_default, separator=None "managed_services", svc_default, separator=None
) )
if self.name in services:
machine: Machine = self.server.lookup_component("machine")
data_path: str = self.server.get_app_args()["data_path"]
asvc = pathlib.Path(data_path).joinpath("moonraker.asvc")
if not machine.is_service_allowed(self.name):
self.server.add_warning(
f"[{config.get_name()}]: Moonraker is not permitted to "
f"restart service '{self.name}'. To enable management "
f"of this service add {self.name} to the bottom of the "
f"file {asvc}. To disable management for this service "
"set 'is_system_service: False' in the configuration "
"for this section."
)
services.clear()
for svc in services: for svc in services:
if svc not in svc_choices: if svc not in svc_choices:
raw = " ".join(services) raw = " ".join(services)
@ -219,9 +234,10 @@ class AppDeploy(BaseDeploy):
async def reinstall(self): async def reinstall(self):
raise NotImplementedError raise NotImplementedError
async def restart_service(self): async def restart_service(self) -> None:
if not self.managed_services: if not self.managed_services:
return return
machine: Machine = self.server.lookup_component("machine")
is_full = self.cmd_helper.is_full_update() is_full = self.cmd_helper.is_full_update()
for svc in self.managed_services: for svc in self.managed_services:
if is_full and svc != self.name: if is_full and svc != self.name:
@ -233,21 +249,12 @@ class AppDeploy(BaseDeploy):
if svc == "moonraker": if svc == "moonraker":
# Launch restart async so the request can return # Launch restart async so the request can return
# before the server restarts # before the server restarts
event_loop = self.server.get_event_loop() machine.restart_moonraker_service()
event_loop.delay_callback(.1, self._do_restart, svc)
else: else:
await self._do_restart(svc) if svc == "klipper":
kconn: Klippy = self.server.lookup_component("klippy_connection")
async def _do_restart(self, svc_name: str) -> None: svc = kconn.unit_name
machine: Machine = self.server.lookup_component("machine") await machine.do_service_action("restart", svc)
try:
await machine.do_service_action("restart", svc_name)
except Exception:
if svc_name == "moonraker":
# We will always get an error when restarting moonraker
# from within the child process, so ignore it
return
raise self.log_exc("Error restarting service")
def get_update_status(self) -> Dict[str, Any]: def get_update_status(self) -> Dict[str, Any]:
return { return {