Added exceptioning handling

reportIPBlock.py

@@ -33,40 +33,54 @@ def main():
         if os.path.exists(socketFile):
             os.remove(socketFile)
 
-        stop_event = threading.Event()
+        stopEvent = threading.Event()
+        failureEvent = threading.Event()
+        
         dataBuffer = []
 
-        def publishData(stop_event):
+        def publishData(stopEvent):
+
+            try:
 
                 if config.loggingMode == 'rabbitmq':
 
                     import rabbitmq
                     rabbitmq = rabbitmq.rabbitMQClient(config.rabbitmqca,config.rabbitmqcacert,config.rabbitmqcakey,config.rabbitmqHost,config.rabbitmqPort,config.rabbitmqRoutingKey)
             
-            while not (stop_event.is_set()):
+                    while not (stopEvent.is_set() and not failureEvent.is_set()):
+                        
                         if dataBuffer:
+                            
                             data = dataBuffer.pop(0)
                     
                         if config.loggingMode == 'rabbitmq':
+                            
                             rabbitmq.publish(f"{data}")
+                        
                         else:
+                            
                             print("Not yet implemented")
 
+            except Exception:
+                failureEvent.set()
+
         def cleanup(signum, frame):
             
             print("Signal received, shutting down...")
-            stop_event.set() 
+            stopEvent.set() 
 
         signal.signal(signal.SIGTERM, cleanup)
         signal.signal(signal.SIGINT, cleanup)
 
-        def server(stop_event):
+        def server(stopEvent):
+
+            try:
                 
                 serverSocket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
                 serverSocket.bind(socketFile)
                 serverSocket.listen(50)
 
-            while not (stop_event.is_set()):
+                while not (stopEvent.is_set() and not failureEvent.is_set()):
             
                     readable, _, _ = select.select([serverSocket], [], [], 1.0)
                 
@@ -81,8 +95,12 @@ def main():
             
                             clientSocket.close()
 
-        publishThread = threading.Thread(target=publishData, args=(stop_event,))
+            except Exception:
-        serverThread = threading.Thread(target=server, args=(stop_event,))
+                
+                failureEvent.set()
+
+        publishThread = threading.Thread(target=publishData, args=(stopEvent,))
+        serverThread = threading.Thread(target=server, args=(stopEvent,))
         
         publishThread.start()
         serverThread.start()
@@ -90,5 +108,9 @@ def main():
         publishThread.join()
         serverThread.join()
 
+        if failure_event.is_set():
+            print("One of the threads failed. Terminating")
+            sys.exit(1)
+
 if __name__ == "__main__":
     main()