Threadterminationbug (#28)

* Fix premature thread termination bug * Change where we wait
andresp · Oct 29, 2023 · f56c94a · f56c94a
1 parent 51b957f
commit f56c94a
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/src/docsismodem/retriever.py b/src/docsismodem/retriever.py
@@ -44,14 +44,20 @@ def runDaemon():
         consoleLogger.info("Running as daemon")
         schedule.every(runEveryMinutes).minutes.do(jobRunner.collectionJob)
 
-        while 1:
-            schedule.run_pending()
-            time.sleep(1)
-
+        if enableHealthProbe is True:
+            while 1:
+                schedule.run_pending()
+                time.sleep(1)
+
     if runAsDaemon:
         runnerThread = threading.Thread(target=runDaemon, daemon=True)
         runnerThread.start()
-        create_flask_app(jobRunner)
+        if enableHealthProbe is True:
+            create_flask_app(jobRunner)
+        else:
+            while 1:
+                schedule.run_pending()
+                time.sleep(1)
     else:
         consoleLogger.info("One-time execution")
         jobRunner.collectionJob()
@@ -60,20 +66,19 @@ def runDaemon():
 
 def create_flask_app(runner):
 
-    if enableHealthProbe is True:
-        app = Flask(__name__)
-        app.register_blueprint(healthz, url_prefix="/healthz")
+    app = Flask(__name__)
+    app.register_blueprint(healthz, url_prefix="/healthz")
 
-        probe = Probe(runner, runEveryMinutes)
+    probe = Probe(runner, runEveryMinutes)
 
-        app.config.update(
-            HEALTHZ = {
-                "live": probe.liveness,
-                "ready": lambda: None,
-            }
-        )
+    app.config.update(
+        HEALTHZ = {
+            "live": probe.liveness,
+            "ready": lambda: None,
+        }
+    )
 
-        app.run(host='0.0.0.0', port=80, debug=False, use_reloader=False) 
+    app.run(host='0.0.0.0', port=80, debug=False, use_reloader=False) 
 
 class CustomTimestampFilter(logging.Filter):
     def filter(self, record):