thomas/monutil
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

Added exceptioning handling

Browse source
This commit is contained in:
Thomas Williams 2024-08-20 11:04:23 +01:00
parent c11943cc67
commit b599a4a483
Signed by: thomas
GPG key ID: EB8F975CF60BCBFF
1 changed files with 52 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
reportIPBlock.py
View file

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