upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns/dnsmasq-to-unbound: fix flake8 linting issues

Browse source
This commit is contained in:
Courtney Hall 2025-12-08 13:07:32 -08:00
parent a50798bf68
commit 9145c56130
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dns/dnsmasq-to-unbound/src/opnsense/scripts/unbound/dnsmasq_watcher.py
View file

@ -51,7 +51,7 @@ import ipaddress
import xml.etree.ElementTree as ET
sys.path.insert(0, "/usr/local/opnsense/site-python")
from daemonize import Daemonize
from daemonize import Daemonize # noqa: E402
LEASE_FILE = '/var/db/dnsmasq.leases'
STATIC_HOSTS_FILE = '/var/etc/dnsmasq-hosts'
@ -632,7 +632,10 @@ class DnsmasqLeaseWatcher:
"Unbound remote control not enabled or Unbound stopped"
)
else:
self.log(f"unbound-control failed ({self.consecutive_failures}/{MAX_CONSECUTIVE_FAILURES}): {stderr}", syslog.LOG_WARNING)
self.log(
f"unbound-control failed ({self.consecutive_failures}/"
f"{MAX_CONSECUTIVE_FAILURES}): {stderr}", syslog.LOG_WARNING
)
else:
self.log(f"unbound-control error: {stderr}", syslog.LOG_WARNING)
return False
@ -647,7 +650,10 @@ class DnsmasqLeaseWatcher:
"Unbound repeatedly timing out"
)
else:
self.log(f"unbound-control timeout ({self.consecutive_failures}/{MAX_CONSECUTIVE_FAILURES})", syslog.LOG_WARNING)
self.log(
f"unbound-control timeout ({self.consecutive_failures}/"
f"{MAX_CONSECUTIVE_FAILURES})", syslog.LOG_WARNING
)
return False
except Exception as e:
self.consecutive_failures += 1
@ -657,7 +663,10 @@ class DnsmasqLeaseWatcher:
f"Repeated unbound-control failures: {e}"
)
else:
self.log(f"unbound-control exception ({self.consecutive_failures}/{MAX_CONSECUTIVE_FAILURES}): {e}", syslog.LOG_ERR)
self.log(
f"unbound-control exception ({self.consecutive_failures}/"
f"{MAX_CONSECUTIVE_FAILURES}): {e}", syslog.LOG_ERR
)
return False
def add_dns_record(self, fqdn_key, record):
@ -1077,7 +1086,10 @@ class DnsmasqLeaseWatcher:
)
break
else:
self.log(f"Error in watch loop ({self.consecutive_failures}/{MAX_CONSECUTIVE_FAILURES}): {e}", syslog.LOG_ERR)
self.log(
f"Error in watch loop ({self.consecutive_failures}/"
f"{MAX_CONSECUTIVE_FAILURES}): {e}", syslog.LOG_ERR
)
time.sleep(FAILURE_RETRY_DELAY)
# If we exited due to failure, enter idle loop

4
dns/dnsmasq-to-unbound/src/opnsense/scripts/unbound/list_dnsmasq_records.py
View file

@ -330,7 +330,9 @@ def get_records():
'ip': lease['ip'],
'type': 'lease',
'mac': lease['mac'],
'expiry': 'infinite' if lease['expiry'] == 0 else time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(lease['expiry'])),
'expiry': 'infinite' if lease['expiry'] == 0 else time.strftime(
'%Y-%m-%d %H:%M:%S', time.localtime(lease['expiry'])
),
'expiry_ts': lease['expiry'] # For comparison
}
# Handle duplicates with conflict resolution