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

[Netfilter] Exit on log line error in pubsub

master
andryyy 2021-04-25 09:23:02 +02:00
parent dfe43f56bf
commit edf1a4fb1f
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/Dockerfiles/netfilter/server.py
View File

@ -309,9 +309,12 @@ def watch():
logInfo('Watching Redis channel F2B_CHANNEL') logInfo('Watching Redis channel F2B_CHANNEL')
pubsub.subscribe('F2B_CHANNEL') pubsub.subscribe('F2B_CHANNEL')
global quit_now
global exit_code
while not quit_now: while not quit_now:
for item in pubsub.listen():
try: try:
for item in pubsub.listen():
refreshF2bregex() refreshF2bregex()
for rule_id, rule_regex in f2bregex.items(): for rule_id, rule_regex in f2bregex.items():
if item['data'] and item['type'] == 'message': if item['data'] and item['type'] == 'message':
@ -327,8 +330,9 @@ def watch():
logWarn('%s matched rule id %s (%s)' % (addr, rule_id, item['data'])) logWarn('%s matched rule id %s (%s)' % (addr, rule_id, item['data']))
ban(addr) ban(addr)
except Exception as ex: except Exception as ex:
logWarn('Could not read logline from pubsub, skipping...') logWarn('Error reading log line from pubsub')
continue quit_now = True
exit_code = 2
def snat4(snat_target): def snat4(snat_target):
global lock global lock