sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-03 00:00:24 -04:00
Code Issues Projects Releases Wiki Activity

testing: Fix vici updown script on Debian bookworm

Browse Source 
OOM-killer is now already triggered with `import daemon`, so set the
limit before that.  Also some PEP8 fixes (including an exclusion for
the above fix as that causes imports to not be at the beginning of the
file).
This commit is contained in:
Tobias Brunner 2023-06-27 18:45:53 +02:00
parent 744955f8ce
commit 995d7785b9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
testing/tests/route-based/net2net-xfrmi-ike/hosts/sun/etc/updown.py
View File

@ -2,11 +2,18 @@
import sys import sys
import vici import vici
import daemon
import logging import logging
from logging.handlers import SysLogHandler from logging.handlers import SysLogHandler
import subprocess import subprocess
# the hard limit (second number) is the value used by python-daemon when closing
# potentially open file descriptors while daemonizing or even triggered by the
# import. since the default limit is 524288 on newer systems, this can take
# quite a while, and due to how this range of FDs is handled internally (as set)
# it can even trigger the OOM killer
import resource import resource
resource.setrlimit(resource.RLIMIT_NOFILE, (256, 256)) # noqa
import daemon
logger = logging.getLogger('updownLogger') logger = logging.getLogger('updownLogger')
@ -59,13 +66,6 @@ def install_routes(ike_sa):
subprocess.call(["ip", "route", "add", ts, "dev", ifname_out]) subprocess.call(["ip", "route", "add", ts, "dev", ifname_out])
# the hard limit (second number) is the value used by python-daemon when closing
# potentially open file descriptors while daemonizing. since the default is
# 524288 on newer systems, this can take quite a while, and due to how this
# range of FDs is handled internally (as set) it can even trigger the OOM killer
resource.setrlimit(resource.RLIMIT_NOFILE, (256, 256))
# daemonize and run parallel to the IKE daemon # daemonize and run parallel to the IKE daemon
with daemon.DaemonContext(): with daemon.DaemonContext():
setup_logger() setup_logger()
@ -75,7 +75,7 @@ with daemon.DaemonContext():
ver = {k: v.decode("UTF-8") for k, v in session.version().items()} ver = {k: v.decode("UTF-8") for k, v in session.version().items()}
logger.info("connected to {daemon} {version} ({sysname}, {release}, " logger.info("connected to {daemon} {version} ({sysname}, {release}, "
"{machine})".format(**ver)) "{machine})".format(**ver))
except: except BaseException:
logger.error("failed to get status via vici") logger.error("failed to get status via vici")
sys.exit(1) sys.exit(1)
@ -95,6 +95,6 @@ with daemon.DaemonContext():
except IOError: except IOError:
logger.error("daemon disconnected") logger.error("daemon disconnected")
except: except BaseException as e:
logger.error("exception while listening for events " + logger.error("exception while listening for events " +
repr(sys.exc_info()[1])) repr(e))