From cc0a27ff10ef946a1ebd8cae133b4e5bfea2c152 Mon Sep 17 00:00:00 2001 From: Thomas Williams Date: Tue, 20 Aug 2024 19:45:31 +0100 Subject: [PATCH] Fix Signed-off-by: Thomas Williams --- reportIPBlock.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/reportIPBlock.py b/reportIPBlock.py index d5893a7..81b8a34 100644 --- a/reportIPBlock.py +++ b/reportIPBlock.py @@ -55,18 +55,22 @@ def main(): if dataBuffer: data = dataBuffer.pop(0) - - if config.loggingMode == 'rabbitmq': - - rabbitmq.publish(f"{data}") + rabbitmq.publish(f"{data}") else: - hostname = socket.gethostname() - ipAddress = socket.gethostbyname(hostname) - data = data.split('|') - manager = log.logsManager(config.sqlServer, config.sqlDatabase, config.sqlUsername, config.sqlPassword) - manager.insertIPBlock(hostname, ipAddress, data[1], data[5], data[6], data[2], config.ipinfoAPIToken) + while not (stopEvent.is_set() and not failureEvent.is_set()): + + time.sleep(1) + + if dataBuffer: + + data = dataBuffer.pop(0) + hostname = socket.gethostname() + ipAddress = socket.gethostbyname(hostname) + data = data.split('|') + manager = log.logsManager(config.sqlServer, config.sqlDatabase, config.sqlUsername, config.sqlPassword) + manager.insertIPBlock(hostname, ipAddress, data[1], data[5], data[6], data[2], config.ipinfoAPIToken) except Exception: failureEvent.set()