jketterl/openwebrx
1
0
Fork 0
mirror of https://github.com/jketterl/openwebrx.git synced 2026-03-03 20:13:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add PopenModules timeout, courtesy of @luarvique

Browse source
This commit is contained in:
Jakob Ketterl 2023-09-14 22:23:09 +02:00
parent 40a7229729
commit 9da37de253
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
csdr/module/__init__.py
View file

@ -4,7 +4,7 @@ from pycsdr.types import Format
from abc import ABCMeta, abstractmethod
from threading import Thread
from io import BytesIO
from subprocess import Popen, PIPE
from subprocess import Popen, PIPE, TimeoutExpired
from functools import partial
import pickle
import logging
@ -185,8 +185,12 @@ class PopenModule(AutoStartModule, metaclass=ABCMeta):
def stop(self):
if self.process is not None:
self.process.terminate()
self.process.wait()
# Try terminating normally, kill if failed to terminate
try:
self.process.terminate()
self.process.wait(3)
except TimeoutExpired:
self.process.kill()
self.process = None
self.reader.stop()