7x31
/
mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update logging messages 

- Update log messages when mailcow target is not present or not in first place
- fix indentation
This commit is contained in:
Vicente 2023-03-11 09:59:56 +01:00
parent 88dfdd1dfb
commit 46d7b95aa5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -541,11 +541,11 @@ def mailcowChainOrder():
if item.target.name == 'MAILCOW':
target_found = True
if position > 2:
logCrit('Error in %s chain order: MAILCOW on position %d, restarting container' % (chain.name, position))
logCrit(f'MAILCOW target is in position {position} in the {chain.name} chain, restarting container to fix it...')
quit_now = True
exit_code = 2
if not target_found:
logCrit('Error in %s chain: MAILCOW target not found, restarting container' % (chain.name))
logCrit(f'MAILCOW target not found in {chain.name} chain, restarting container to fix it...')
quit_now = True
exit_code = 2
else:
@ -555,12 +555,12 @@ def mailcowChainOrder():
if chain_position is None: continue
if chain_position is False:
logCrit('Error in %s %s chain: MAILCOW target not found, restarting container' % (family, chain))
logCrit(f'MAILCOW target not found in {family} {chain} table, restarting container to fix it...')
quit_now = True
exit_code = 2
if chain_position > 0:
logCrit('Error in %s %s chain order: MAILCOW on position %d, restarting container' % (family, chain, chain_position))
logCrit(f'MAILCOW target is in position {chain_position} in the {family} {chain} table, restarting container to fix it...')
quit_now = True
exit_code = 2