Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

[Netfilter] fix redis logs

Browse Source
This commit is contained in:
FreddleSpl0it 2024-02-05 09:47:19 +01:00
parent 57e67ea8f7
commit 464b6f2e93
No known key found for this signature in database
GPG Key ID: 00E14E7634F4BEC5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/Dockerfiles/netfilter/main.py
View File

@ -395,7 +395,7 @@ if __name__ == '__main__':
signal.signal(signal.SIGTERM, sigterm_quit) signal.signal(signal.SIGTERM, sigterm_quit)
# init Logger # init Logger
logger = Logger(None) logger = Logger()
# init backend # init backend
backend = sys.argv[1] backend = sys.argv[1]
@ -437,7 +437,7 @@ if __name__ == '__main__':
time.sleep(3) time.sleep(3)
else: else:
break break
Logger.r = r logger.set_redis(r)
# rename fail2ban to netfilter # rename fail2ban to netfilter
if r.exists('F2B_LOG'): if r.exists('F2B_LOG'):

7
data/Dockerfiles/netfilter/modules/Logger.py
View File

@ -2,7 +2,10 @@ import time
import json import json
class Logger: class Logger:
def __init__(self, redis): def __init__(self):
self.r = None
def set_redis(self, redis):
self.r = redis self.r = redis
def log(self, priority, message): def log(self, priority, message):
@ -10,7 +13,7 @@ class Logger:
tolog['time'] = int(round(time.time())) tolog['time'] = int(round(time.time()))
tolog['priority'] = priority tolog['priority'] = priority
tolog['message'] = message tolog['message'] = message
if self.r: if self.r is not None:
self.r.lpush('NETFILTER_LOG', json.dumps(tolog, ensure_ascii=False)) self.r.lpush('NETFILTER_LOG', json.dumps(tolog, ensure_ascii=False))
print(message) print(message)