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

[netfilter] Use exit code 2 if an error occurs (#4040)

master
monsterry 2021-04-25 09:13:26 +02:00 committed by GitHub
parent e1c9c7094e
commit dfe43f56bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
import re import re
import os import os
import sys
import time import time
import atexit import atexit
import signal import signal
@ -39,6 +40,7 @@ BLACKLIST= []
bans = {} bans = {}
quit_now = False quit_now = False
exit_code = 0
lock = Lock() lock = Lock()
def log(priority, message): def log(priority, message):
@ -61,6 +63,7 @@ def logInfo(message):
def refreshF2boptions(): def refreshF2boptions():
global f2boptions global f2boptions
global quit_now global quit_now
global exit_code
if not r.get('F2B_OPTIONS'): if not r.get('F2B_OPTIONS'):
f2boptions = {} f2boptions = {}
f2boptions['ban_time'] = int f2boptions['ban_time'] = int
@ -81,10 +84,12 @@ def refreshF2boptions():
except ValueError: except ValueError:
print('Error loading F2B options: F2B_OPTIONS is not json') print('Error loading F2B options: F2B_OPTIONS is not json')
quit_now = True quit_now = True
exit_code = 2
def refreshF2bregex(): def refreshF2bregex():
global f2bregex global f2bregex
global quit_now global quit_now
global exit_code
if not r.get('F2B_REGEX'): if not r.get('F2B_REGEX'):
f2bregex = {} f2bregex = {}
f2bregex[1] = 'warning: .*\[([0-9a-f\.:]+)\]: SASL .+ authentication failed' f2bregex[1] = 'warning: .*\[([0-9a-f\.:]+)\]: SASL .+ authentication failed'
@ -103,6 +108,7 @@ def refreshF2bregex():
except ValueError: except ValueError:
print('Error loading F2B options: F2B_REGEX is not json') print('Error loading F2B options: F2B_REGEX is not json')
quit_now = True quit_now = True
exit_code = 2
if r.exists('F2B_LOG'): if r.exists('F2B_LOG'):
r.rename('F2B_LOG', 'NETFILTER_LOG') r.rename('F2B_LOG', 'NETFILTER_LOG')
@ -110,6 +116,7 @@ if r.exists('F2B_LOG'):
def mailcowChainOrder(): def mailcowChainOrder():
global lock global lock
global quit_now global quit_now
global exit_code
while not quit_now: while not quit_now:
time.sleep(10) time.sleep(10)
with lock: with lock:
@ -128,9 +135,11 @@ def mailcowChainOrder():
if position > 2: if position > 2:
logCrit('Error in %s chain order: MAILCOW on position %d, restarting container' % (chain.name, position)) logCrit('Error in %s chain order: MAILCOW on position %d, restarting container' % (chain.name, position))
quit_now = True quit_now = True
exit_code = 2
if not target_found: if not target_found:
logCrit('Error in %s chain: MAILCOW target not found, restarting container' % (chain.name)) logCrit('Error in %s chain: MAILCOW target not found, restarting container' % (chain.name))
quit_now = True quit_now = True
exit_code = 2
def ban(address): def ban(address):
global lock global lock
@ -559,3 +568,5 @@ if __name__ == '__main__':
while not quit_now: while not quit_now:
time.sleep(0.5) time.sleep(0.5)
sys.exit(exit_code)