Merge pull request #19 from xwu2git/master

handle SIGTERM to gracefully exit; fix office->recording link;

Author: xwu2git

analytics/feeder/main.py

@@ -2,6 +2,7 @@
 
 from db_ingest import DBIngest
 from db_query import DBQuery
+from signal import signal, SIGTERM
 
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
@@ -14,10 +15,7 @@
 from threading import Timer
 from probe import probe, run
 import time
-import datetime
 import os
-import sys
-import signal
 import tempfile
 import shutil
 import re
@@ -114,12 +112,13 @@ def stop(self):
         logger.info(" ### Stopping Feeder ### ")
 
         self._threadflag = False
-        self.mqttclient.loop_stop()
-        self.observer.stop()
 
         logger.debug("Unregistering algorithm from DB")
         self.db_alg.delete(self.alg_id)
 
+        self.mqttclient.loop_stop()
+        self.observer.stop()
+
     def startmqtt(self):
         self.mqttclient = mqtt.Client("feeder_" + self.alg_id)
         self.mqttclient.connect(self.mqtthost)
@@ -345,6 +344,15 @@ def ingest(self):
 
 if __name__ == '__main__':
     smtc_feeder = Feeder()
+
+    def quit_nicely(signum, sigframe):
+        try:
+            smtc_feeder.stop()
+        except Exception as e:
+            print("quit exception"+str(e))
+        exit(143)
+    signal(SIGTERM, quit_nicely)
+
     try:
         smtc_feeder.start()
     except KeyboardInterrupt:

maintenance/cleanup/Dockerfile

@@ -4,7 +4,7 @@ FROM centos:7.6.1810
 RUN yum -y install epel-release && yum -y install python36-requests python36-ply && rm -rf /var/cache/yum/*
 
 COPY    *.py /home/
-CMD     ["/bin/bash","-c","/home/main.py"]
+CMD     ["/home/main.py"]
 
 ####
 ARG  USER

maintenance/cleanup/main.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 from db_query import DBQuery
+from signal import signal, SIGTERM
 import time
 import os
 
@@ -10,13 +11,19 @@
 office=list(map(float, os.environ["OFFICE"].split(",")))
 dbhost=os.environ["DBHOST"]
 
-while True:
+def quit_nicely(signum, sigframe):
+    exit(143)
+
+# set signal to quit nicely
+signal(SIGTERM, quit_nicely)
+
+while True: 
     time.sleep(service_interval)
 
     print("Searching...",flush=True)
     for index in indexes:
         db=DBQuery(index=index,office=office,host=dbhost)
-        for r in db.search("time<now-"+str(retention_time*1000)):
+        for r in db.search("time<now-"+str(retention_time*1000), size=500):
             # delete the record
             db.delete(r["_id"])
 
@@ -26,4 +33,3 @@
                     os.remove(r["_source"]["path"])
                 except Exception as e:
                     print(str(e))
-

maintenance/where_indexing/Dockerfile

@@ -4,7 +4,7 @@ FROM centos:7.6.1810
 RUN yum -y install epel-release && yum -y install python36-requests python36-ply && rm -rf /var/cache/yum/*
 
 COPY    *.py /home/
-CMD     ["/bin/bash","-c","/home/main.py"]
+CMD     ["/home/main.py"]
 
 ####
 ARG  USER

maintenance/where_indexing/main.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 from db_query import DBQuery
+from signal import signal, SIGTERM
 import os
 import time
 
@@ -12,6 +13,12 @@
 office=list(map(float, os.environ["OFFICE"].split(",")))
 dbhost=os.environ["DBHOST"]
 
+def quit_nicely(signum, sigframe):
+    exit(143)
+
+# set signal to quit nicely
+signal(SIGTERM, quit_nicely)
+
 dbq=DBQuery(index=indexes[0],office=office,host=dbhost)
 dba=DBQuery(index=indexes[1],office=office,host=dbhost)
 while True:

sensor/onvif/Dockerfile

@@ -26,7 +26,7 @@ RUN  wget ${ZEEP_REPO} && \
      rm v${ONVIF_ZEEP_VER}.tar.gz
 
 COPY    *.py /home/
-CMD     ["/bin/bash","-c","/home/main.py"]
+CMD     ["/home/main.py"]
 WORKDIR /home
 EXPOSE  80
 

sensor/onvif/main.py

@@ -8,6 +8,7 @@
 import subprocess
 from onvif import ONVIFCamera, ONVIFError
 import xml.etree.ElementTree as ET
+from signal import SIGTERM, signal
 
 from db_query import DBQuery
 from db_ingest import DBIngest
@@ -317,4 +318,8 @@ def discover_all_onvif_cameras():
         time.sleep(60)
 
 if __name__ == "__main__":
+    def quit_nicely(signum, sigframe):
+        exit(143)
+    signal(SIGTERM, quit_nicely)
+
     discover_all_onvif_cameras()

sensor/simulation/Dockerfile

@@ -2,7 +2,7 @@
 FROM ubuntu:18.04
 RUN apt-get update && apt-get install -y -q python3-requests vlc && rm -rf /var/lib/apt/lists/*
 COPY *.py /home/
-ENTRYPOINT ["/bin/bash","-c","/home/main.py"]
+CMD ["/home/main.py"]
 
 ####
 ARG  USER

sensor/simulation/main.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 from db_ingest import DBIngest
+from signal import signal, SIGTERM
 import subprocess
 import socket
 import math
@@ -61,6 +62,14 @@ def geo_point(origin, distance, tc):
     "status": "idle",
 })
 
+def quit_nicely(signum, sigframe):
+    try:
+        db.delete(r["_id"])
+    except Exception as e:
+        print("quit exception: "+str(e))
+    exit(143)
+signal(SIGTERM, quit_nicely)
+
 # run rtspatt
 while True:
     simulated_root="/mnt/simulated"

trigger/health/Dockerfile

@@ -3,7 +3,7 @@ FROM centos:7.6.1810
 
 RUN yum install -y epel-release && yum install -y python36-requests python36-ply && rm -rf /var/cache/yum/*
 COPY *.py /home/
-CMD  ["/bin/bash","-c","/home/main.py"]
+CMD  ["/home/main.py"]
 
 ####
 ARG  USER