GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 09:01:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use process_name_prefix to kill ustreamer

Browse Source
This commit is contained in:
Devaev Maxim
2019-10-12 00:00:40 +03:00
parent 74449c81ad
commit 35a40614e5
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kvmd/apps/cleanup/__init__.py
View File

@@ -72,22 +72,23 @@ def _clear_gpio(config: Section) -> None:
def _kill_streamer(config: Section) -> None:
logger = get_logger(0)
streamer = os.path.basename(config.streamer.cmd[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>")
logger.info("Trying to find and kill %r ...", streamer)
for proc in psutil.process_iter():
attrs = proc.as_dict(attrs=["name"])
if os.path.basename(attrs.get("name", "")) == streamer:
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():
for proc in psutil.process_iter():
attrs = proc.as_dict(attrs=["name"])
if attrs.get("name", "").startswith(prefix):
try:
proc.send_signal(signal.SIGKILL)
proc.send_signal(signal.SIGTERM)
except Exception:
logger.exception("Can't send SIGKILL to streamer with pid=%d", proc.pid)
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 _remove_sockets(config: Section) -> None: