ruben/jail2ban
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify code by letting run() generate exception on non zero exit status

Browse Source
This commit is contained in:
Ruben van Staveren 2022-03-11 20:42:19 +01:00
parent f3f8bd5dc6
commit 34f871ae75
Signed by: ruben
GPG Key ID: 886F6BECD477A93F
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jail2ban/pfctl.py
View File

@ -9,12 +9,10 @@ def pfctl_cfg_read(anchor):
cmd = [_SUDO, _PFCTL, '-a', anchor, '-sr'] cmd = [_SUDO, _PFCTL, '-a', anchor, '-sr']
logging.info('Running %s', cmd) logging.info('Running %s', cmd)
res = run(cmd, capture_output=True) res = run(cmd, capture_output=True, check=True)
if res and res.stdout: logging.info('Result: %s', res)
logging.info('Result: %s', res) return res.stdout.splitlines()
res.check_returncode()
return res.stdout.splitlines()
def pfctl_cfg_write(anchor, cfg): def pfctl_cfg_write(anchor, cfg):
@ -24,12 +22,11 @@ def pfctl_cfg_write(anchor, cfg):
res = run(cmd, res = run(cmd,
input=cfg, input=cfg,
check=True,
capture_output=True) capture_output=True)
if res: logging.info('Result: %s', res)
logging.info('Result: %s', res) return res.stdout.splitlines()
res.check_returncode()
return res.stdout.splitlines()
def pfctl_table_op(anchor, **kwargs): def pfctl_table_op(anchor, **kwargs):
@ -40,9 +37,9 @@ def pfctl_table_op(anchor, **kwargs):
logging.info('Running %s', cmd) logging.info('Running %s', cmd)
res = run([x for x in cmd if x is not None], capture_output=True) res = run([x for x in cmd if x is not None],
capture_output=True,
check=True)
if res: logging.debug(res)
logging.debug(res) return res.stdout.splitlines()
res.check_returncode()
return res.stdout.splitlines()