From 8ab16a1fb25de426e15d7e2412e3a8ea3b3ebf74 Mon Sep 17 00:00:00 2001 From: Daniel Markstedt Date: Tue, 19 Oct 2021 17:58:30 -0700 Subject: [PATCH] Restart monitor_rascsi from the Web UI (#341) --- src/web/pi_cmds.py | 4 ++-- src/web/web.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/web/pi_cmds.py b/src/web/pi_cmds.py index 1e1d8daf..61554b96 100644 --- a/src/web/pi_cmds.py +++ b/src/web/pi_cmds.py @@ -1,10 +1,10 @@ import subprocess -def rascsi_service(action): +def systemd_service(service, action): # start/stop/restart return ( - subprocess.run(["sudo", "/bin/systemctl", action, "rascsi.service"]).returncode + subprocess.run(["sudo", "/bin/systemctl", action, service]).returncode == 0 ) diff --git a/src/web/web.py b/src/web/web.py index 54e86a97..7d49e030 100644 --- a/src/web/web.py +++ b/src/web/web.py @@ -29,8 +29,8 @@ from pi_cmds import ( shutdown_pi, reboot_pi, running_env, + systemd_service, running_netatalk, - rascsi_service, is_bridge_setup, disk_space, ) @@ -473,7 +473,8 @@ def rascsi_restart(): detach_all() flash("Safely detached all devices.") flash("Restarting RaSCSI Service...") - rascsi_service("restart") + systemd_service("rascsi.service", "restart") + systemd_service("monitor_rascsi.service", "restart") return redirect(url_for("index"))