From 5d77a44ccf16dcc9dee684964d213de39edebe27 Mon Sep 17 00:00:00 2001 From: kulikov-a <36099472+kulikov-a@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:13:46 +0300 Subject: [PATCH] unbound: fix typo in logger. create a pipe early in dnsbl_module.py (#6340) --- src/opnsense/scripts/unbound/logger.py | 6 +++--- .../service/templates/OPNsense/Unbound/core/dnsbl_module.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/opnsense/scripts/unbound/logger.py b/src/opnsense/scripts/unbound/logger.py index 03db3fb14..431f7601a 100755 --- a/src/opnsense/scripts/unbound/logger.py +++ b/src/opnsense/scripts/unbound/logger.py @@ -188,7 +188,7 @@ class DNSReader: r_count = 0 pipe_ready = False # give dnsbl_module.py some time to create a pipe - while r_count < 3 and not pipe_ready: + while not pipe_ready: try: # open() will block until a query has been pushed down the fifo self.fd = open(self.target_pipe, 'r') @@ -196,8 +196,8 @@ class DNSReader: except InterruptedError: self.close_logger() except OSError: - r_count =+ 1 - if r_count == 3: + r_count += 1 + if r_count > 10: syslog.syslog(syslog.LOG_ERR, "Unable to open pipe. This is likely because Unbound isn't running.") sys.exit(1) time.sleep(1) diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/dnsbl_module.py b/src/opnsense/service/templates/OPNsense/Unbound/core/dnsbl_module.py index c0674fb6c..a930a58f0 100644 --- a/src/opnsense/service/templates/OPNsense/Unbound/core/dnsbl_module.py +++ b/src/opnsense/service/templates/OPNsense/Unbound/core/dnsbl_module.py @@ -65,9 +65,9 @@ class ModuleContext: self.lock = Lock() self.pipe_buffer = deque(maxlen=100000) # buffer to hold qdata as long as a backend is not present - self.update_dnsbl(self.log_update_time) if self.stats_enabled: self.create_pipe_rdv() + self.update_dnsbl(self.log_update_time) def dnsbl_exists(self): return os.path.isfile(self.dnsbl_path) and os.path.getsize(self.dnsbl_path) > 0