Move more things out of FrigateApp (#13897)

* Moved FrigateApp.init_config() into FrigateConfig.load()

* Move frigate config loading into main

* Store PlusApi in FrigateConfig

* Register SIGTERM handler in main

* Ensure logging is setup during config parsing

* Removed pointless try

* Moved config initialization out of FrigateApp

* Made FrigateApp.shm_frame_count into a function

* Removed log calls from signal handlers

python's logging calls are not re-entrant, which caused at least one of
these to deadlock randomly.

* Reopen stdout/err on process fork

This helps avoid deadlocks (https://github.com/python/cpython/issues/91776).

* Make mypy happy

* Whoops. I might have forgotten to save.

Truly an amateur mistake.

* Always call FrigateApp.stop()

frigate/api/app.py

@@ -28,7 +28,6 @@ from frigate.const import CONFIG_DIR
 from frigate.embeddings import EmbeddingsContext
 from frigate.events.external import ExternalEventProcessor
 from frigate.models import Event, Timeline
-from frigate.plus import PlusApi
 from frigate.ptz.onvif import OnvifController
 from frigate.stats.emitter import StatsEmitter
 from frigate.storage import StorageMaintainer
@@ -61,7 +60,6 @@ def create_app(
     storage_maintainer: StorageMaintainer,
     onvif: OnvifController,
     external_processor: ExternalEventProcessor,
-    plus_api: PlusApi,
     stats_emitter: StatsEmitter,
 ):
     app = Flask(__name__)
@@ -89,7 +87,6 @@ def create_app(
     app.storage_maintainer = storage_maintainer
     app.onvif = onvif
     app.external_processor = external_processor
-    app.plus_api = plus_api
     app.camera_error_image = None
     app.stats_emitter = stats_emitter
     app.jwt_token = get_jwt_secret() if frigate_config.auth.enabled else None
@@ -199,7 +196,7 @@ def config():
         for zone_name, zone in config_obj.cameras[camera_name].zones.items():
             camera_dict["zones"][zone_name]["color"] = zone.color
 
-    config["plus"] = {"enabled": current_app.plus_api.is_active()}
+    config["plus"] = {"enabled": current_app.frigate_config.plus_api.is_active()}
     config["model"]["colormap"] = config_obj.model.colormap
 
     for detector_config in config["detectors"].values():
@@ -362,7 +359,7 @@ def config_set():
 
     if json.get("requires_restart", 1) == 0:
         current_app.frigate_config = FrigateConfig.parse_object(
-            config_obj, plus_api=current_app.plus_api
+            config_obj, plus_api=current_app.frigate_config.plus_api
         )
 
     return make_response(

frigate/api/event.py

@@ -612,7 +612,7 @@ def set_retain(id):
 
 @EventBp.route("/events/<id>/plus", methods=("POST",))
 def send_to_plus(id):
-    if not current_app.plus_api.is_active():
+    if not current_app.frigate_config.plus_api.is_active():
         message = "PLUS_API_KEY environment variable is not set"
         logger.error(message)
         return make_response(
@@ -680,7 +680,7 @@ def send_to_plus(id):
         )
 
     try:
-        plus_id = current_app.plus_api.upload_image(image, event.camera)
+        plus_id = current_app.frigate_config.plus_api.upload_image(image, event.camera)
     except Exception as ex:
         logger.exception(ex)
         return make_response(
@@ -696,7 +696,7 @@ def send_to_plus(id):
         box = event.data["box"]
 
         try:
-            current_app.plus_api.add_annotation(
+            current_app.frigate_config.plus_api.add_annotation(
                 event.plus_id,
                 box,
                 event.label,
@@ -720,7 +720,7 @@ def send_to_plus(id):
 
 @EventBp.route("/events/<id>/false_positive", methods=("PUT",))
 def false_positive(id):
-    if not current_app.plus_api.is_active():
+    if not current_app.frigate_config.plus_api.is_active():
         message = "PLUS_API_KEY environment variable is not set"
         logger.error(message)
         return make_response(
@@ -769,7 +769,7 @@ def false_positive(id):
     )
 
     try:
-        current_app.plus_api.add_false_positive(
+        current_app.frigate_config.plus_api.add_false_positive(
             event.plus_id,
             region,
             box,

frigate/api/media.py

@@ -294,7 +294,7 @@ def submit_recording_snapshot_to_plus(camera_name: str, frame_time: str):
             )
 
         nd = cv2.imdecode(np.frombuffer(image_data, dtype=np.int8), cv2.IMREAD_COLOR)
-        current_app.plus_api.upload_image(nd, camera_name)
+        current_app.frigate_config.plus_api.upload_image(nd, camera_name)
 
         return make_response(
             jsonify(