mirror of
https://github.com/mofeng-git/One-KVM.git
synced 2026-01-29 00:51:53 +08:00
Removed kvmd-cleanup
Systemd kills all orphaned children when using KillMode=mixed
This commit is contained in:
@@ -1,75 +0,0 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
# the Free Software Foundation, either version 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# This program is distributed in the hope that it will be useful, #
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||||
# GNU General Public License for more details. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import signal
|
||||
import time
|
||||
|
||||
import psutil
|
||||
|
||||
from ...logging import get_logger
|
||||
|
||||
from ...yamlconf import Section
|
||||
|
||||
from .. import init
|
||||
|
||||
|
||||
# =====
|
||||
def _kill_streamer(config: Section) -> None:
|
||||
logger = get_logger(0)
|
||||
|
||||
if config.streamer.process_name_prefix:
|
||||
prefix = config.streamer.process_name_prefix + ":"
|
||||
logger.info("Trying to find and kill the streamer %r ...", prefix + " <app>")
|
||||
|
||||
for proc in psutil.process_iter():
|
||||
attrs = proc.as_dict(attrs=["name"])
|
||||
if attrs.get("name", "").startswith(prefix):
|
||||
try:
|
||||
proc.send_signal(signal.SIGTERM)
|
||||
except Exception:
|
||||
logger.exception("Can't send SIGTERM to streamer with pid=%d", proc.pid)
|
||||
time.sleep(3)
|
||||
if proc.is_running():
|
||||
try:
|
||||
proc.send_signal(signal.SIGKILL)
|
||||
except Exception:
|
||||
logger.exception("Can't send SIGKILL to streamer with pid=%d", proc.pid)
|
||||
|
||||
|
||||
# =====
|
||||
def main(argv: (list[str] | None)=None) -> None:
|
||||
config = init(
|
||||
prog="kvmd-cleanup",
|
||||
description="Kill KVMD and clear resources",
|
||||
check_run=True,
|
||||
argv=argv,
|
||||
)[2].kvmd
|
||||
|
||||
logger = get_logger(0)
|
||||
logger.info("Cleaning up ...")
|
||||
|
||||
try:
|
||||
_kill_streamer(config)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
logger.info("Bye-bye")
|
||||
@@ -1,24 +0,0 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
# the Free Software Foundation, either version 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# This program is distributed in the hope that it will be useful, #
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||||
# GNU General Public License for more details. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
from . import main
|
||||
main()
|
||||
Reference in New Issue
Block a user