From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/3] unbound-dhcp-leases-bridge: Improve logging
Date: Tue, 29 Mar 2022 11:34:55 +0000
Message-ID: <20220329113457.555479-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8491965379543179205=="
List-Id: <development.lists.ipfire.org>

--===============8491965379543179205==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This improves logging and enables logging to the console.

Suggested-by: Anthony Heading <ajrh(a)ajrh.net>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/unbound/unbound-dhcp-leases-bridge | 26 ++++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbou=
nd-dhcp-leases-bridge
index a2df5f101..ce0cb8614 100644
--- a/config/unbound/unbound-dhcp-leases-bridge
+++ b/config/unbound/unbound-dhcp-leases-bridge
@@ -30,27 +30,37 @@ import re
 import signal
 import stat
 import subprocess
+import sys
 import tempfile
=20
 import inotify.adapters
=20
 LOCAL_TTL =3D 60
=20
-def setup_logging(loglevel=3Dlogging.INFO):
-	log =3D logging.getLogger("dhcp")
+log =3D logging.getLogger("dhcp")
+log.setLevel(logging.DEBUG)
+
+def setup_logging(daemon=3DTrue, loglevel=3Dlogging.INFO):
 	log.setLevel(loglevel)
=20
+	# Log to syslog by default
 	handler =3D logging.handlers.SysLogHandler(address=3D"/dev/log", facility=
=3D"daemon")
-	handler.setLevel(loglevel)
+	log.addHandler(handler)
=20
+	# Format everything
 	formatter =3D logging.Formatter("%(name)s[%(process)d]: %(message)s")
 	handler.setFormatter(formatter)
=20
-	log.addHandler(handler)
+	handler.setLevel(loglevel)
=20
-	return log
+	# If we are running in foreground, we should write everything to the consol=
e, too
+	if not daemon:
+		handler =3D logging.StreamHandler()
+		log.addHandler(handler)
=20
-log =3D logging.getLogger("dhcp")
+		handler.setLevel(loglevel)
+
+	return log
=20
 def ip_address_to_reverse_pointer(address):
 	parts =3D address.split(".")
@@ -579,12 +589,12 @@ if __name__ =3D=3D "__main__":
 		elif args.verbose >=3D 2:
 			loglevel =3D logging.DEBUG
=20
-	setup_logging(loglevel)
+	setup_logging(daemon=3Dargs.daemon, loglevel=3Dloglevel)
=20
 	bridge =3D UnboundDHCPLeasesBridge(args.dhcp_leases, args.fix_leases,
 		args.unbound_leases, args.hosts)
=20
-	ctx =3D daemon.DaemonContext(detach_process=3Dargs.daemon)
+	ctx =3D daemon.DaemonContext(detach_process=3Dargs.daemon, stderr=3Dsys.std=
err)
 	ctx.signal_map =3D {
 		signal.SIGHUP  : bridge.update_dhcp_leases,
 		signal.SIGTERM : bridge.terminate,
--=20
2.30.2


--===============8491965379543179205==--