[PATCH v2 1/5] unbound-dhcp-leases-bridge: Improve logging

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2210 bytes --]

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/unbound-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
 
 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)
 
-	return log
+	# If we are running in foreground, we should write everything to the console, too
+	if not daemon:
+		handler = logging.StreamHandler()
+		log.addHandler(handler)
 
-log = logging.getLogger("dhcp")
+		handler.setLevel(loglevel)
+
+	return log
 
 def ip_address_to_reverse_pointer(address):
 	parts = address.split(".")
@@ -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,
-- 
2.30.2