From cb510320facfb6db3eccea4da99ce8bc12eadc89 Mon Sep 17 00:00:00 2001 From: Stephan de Wit Date: Fri, 20 Jan 2023 12:52:50 +0100 Subject: [PATCH] unbound: fix deadlock by specifying a pidfile to daemon --- src/opnsense/scripts/unbound/logger.py | 3 +-- src/opnsense/scripts/unbound/start.sh | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/opnsense/scripts/unbound/logger.py b/src/opnsense/scripts/unbound/logger.py index 484cfd832..141474e5d 100755 --- a/src/opnsense/scripts/unbound/logger.py +++ b/src/opnsense/scripts/unbound/logger.py @@ -179,7 +179,7 @@ class DNSReader: return True def run_logger(self): - # override the Daemonize signal handler + # set a signal handler signal.signal(signal.SIGINT, self._sig) signal.signal(signal.SIGTERM, self._sig) @@ -213,7 +213,6 @@ def run(pipe, flush_interval): if __name__ == '__main__': parser = argparse.ArgumentParser() - parser.add_argument('--pid', help='pid file location', default='/var/run/unbound_logger.pid') parser.add_argument('--pipe', help='named pipe file location', default='/var/unbound/data/dns_logger') parser.add_argument('--flush_interval', help='interval to flush to db', default=10) diff --git a/src/opnsense/scripts/unbound/start.sh b/src/opnsense/scripts/unbound/start.sh index 30e518f78..c7a342c28 100755 --- a/src/opnsense/scripts/unbound/start.sh +++ b/src/opnsense/scripts/unbound/start.sh @@ -71,5 +71,6 @@ if [ -n "${DOMAIN}" ]; then fi if [ -f /var/unbound/data/stats ]; then - /usr/sbin/daemon -f -S -m 2 -s err -l local4 -T unbound /usr/local/opnsense/scripts/unbound/logger.py + /usr/sbin/daemon -p /var/run/unbound_logger.pid -f -S -m 2 -s err -l local4 \ + -T unbound /usr/local/opnsense/scripts/unbound/logger.py fi