mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-15 15:45:27 +03:00
Added stop_event to util.Process
util.Process will take care of receiving signals when the stop_event is accessed in the subclass. If it never is, SystemExit is raised instead. This has the effect of still behaving like multiprocessing.Process when stop_event is not accessed, while still allowing subclasses to not deal with the hassle of setting it up.
This commit is contained in:
parent
e725730982
commit
9792136950
@ -1,5 +1,8 @@
|
|||||||
import logging
|
import logging
|
||||||
import multiprocessing as mp
|
import multiprocessing as mp
|
||||||
|
import signal
|
||||||
|
import sys
|
||||||
|
import threading
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
from logging.handlers import QueueHandler
|
from logging.handlers import QueueHandler
|
||||||
from typing import Any
|
from typing import Any
|
||||||
@ -46,10 +49,31 @@ class BaseProcess(mp.Process):
|
|||||||
|
|
||||||
|
|
||||||
class Process(BaseProcess):
|
class Process(BaseProcess):
|
||||||
|
@property
|
||||||
|
def stop_event(self) -> threading.Event:
|
||||||
|
# Lazily create the stop_event. This allows the signal handler to tell if anyone is
|
||||||
|
# monitoring the stop event, and to raise a SystemExit if not.
|
||||||
|
if "stop_event" not in self.__dict__:
|
||||||
|
self.__dict__["stop_event"] = threading.Event()
|
||||||
|
return self.__dict__["stop_event"]
|
||||||
|
|
||||||
def before_start(self) -> None:
|
def before_start(self) -> None:
|
||||||
self.__log_queue = frigate.log.log_listener.queue
|
self.__log_queue = frigate.log.log_listener.queue
|
||||||
|
|
||||||
def before_run(self) -> None:
|
def before_run(self) -> None:
|
||||||
|
def receiveSignal(signalNumber, frame):
|
||||||
|
# Get the stop_event through the dict to bypass lazy initialization.
|
||||||
|
stop_event = self.__dict__.get("stop_event")
|
||||||
|
if stop_event is not None:
|
||||||
|
# Someone is monitoring stop_event. We should set it.
|
||||||
|
stop_event.set()
|
||||||
|
else:
|
||||||
|
# Nobody is monitoring stop_event. We should raise SystemExit.
|
||||||
|
sys.exit()
|
||||||
|
|
||||||
|
signal.signal(signal.SIGTERM, receiveSignal)
|
||||||
|
signal.signal(signal.SIGINT, receiveSignal)
|
||||||
|
|
||||||
if self.__log_queue:
|
if self.__log_queue:
|
||||||
logging.basicConfig(handlers=[], force=True)
|
logging.basicConfig(handlers=[], force=True)
|
||||||
logging.getLogger().addHandler(QueueHandler(self.__log_queue))
|
logging.getLogger().addHandler(QueueHandler(self.__log_queue))
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user