webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-05 03:18:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

unbound-dhcp-leases-bridge: Improve logging

Browse Source 
This improves logging and enables logging to the console.

Suggested-by: Anthony Heading <ajrh@ajrh.net>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2022-03-30 09:56:31 +00:00
committed by Peter Müller
parent d52a6280ec
commit 29a3603610
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
config/unbound/unbound-dhcp-leases-bridge
View File

@@ -30,28 +30,38 @@ import re
import signal
import stat
import subprocess
import sys
import tempfile
import inotify.adapters
LOCAL_TTL = 60
def setup_logging(loglevel=logging.INFO):
log = logging.getLogger("dhcp")
log = logging.getLogger("dhcp")
log.setLevel(logging.DEBUG)
def setup_logging(daemon=True, loglevel=logging.INFO):
log.setLevel(loglevel)
# Log to syslog by default
handler = logging.handlers.SysLogHandler(address="/dev/log", facility="daemon")
handler.setLevel(loglevel)
log.addHandler(handler)
# Format everything
formatter = logging.Formatter("%(name)s[%(process)d]: %(message)s")
handler.setFormatter(formatter)
log.addHandler(handler)
handler.setLevel(loglevel)
# If we are running in foreground, we should write everything to the console, too
if not daemon:
handler = logging.StreamHandler()
log.addHandler(handler)
handler.setLevel(loglevel)
return log
log = logging.getLogger("dhcp")
def ip_address_to_reverse_pointer(address):
parts = address.split(".")
parts.reverse()
@@ -579,12 +589,12 @@ if __name__ == "__main__":
elif args.verbose >= 2:
loglevel = logging.DEBUG
setup_logging(loglevel)
setup_logging(daemon=args.daemon, loglevel=loglevel)
bridge = UnboundDHCPLeasesBridge(args.dhcp_leases, args.fix_leases,
args.unbound_leases, args.hosts)
ctx = daemon.DaemonContext(detach_process=args.daemon)
ctx = daemon.DaemonContext(detach_process=args.daemon, stderr=sys.stderr)
ctx.signal_map = {
signal.SIGHUP : bridge.update_dhcp_leases,
signal.SIGTERM : bridge.terminate,