From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 May 2022 08:51:26 +0000 (+0000)
Subject: daemon: Add flags to be more verbose
X-Git-Tag: 0.9.28~737
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b3f137845390aa10c5fd0774ad9903e944e3a24;p=pakfire.git

daemon: Add flags to be more verbose

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/pakfire/daemon.py b/src/pakfire/daemon.py
index 84f130089..35d7c9c15 100644
--- a/src/pakfire/daemon.py
+++ b/src/pakfire/daemon.py
@@ -3,6 +3,7 @@
 import asyncio
 import hashlib
 import json
+import logging
 import multiprocessing
 import os
 import signal
@@ -35,13 +36,15 @@ class BuildJob(dict):
 
 
 class Daemon(object):
-	def __init__(self, config_file="daemon.conf"):
+	def __init__(self, config_file="daemon.conf", debug=False, verbose=False):
 		self.config = config.Config(config_file)
 
 		# Setup logger
 		self.log = logger.setup(
 			"pakfire.daemon",
+			level=logging.DEBUG if debug else logging.INFO,
 			syslog_identifier="pakfire-daemon",
+			enable_console=verbose,
 		)
 
 		# Connect to the Pakfire Hub
diff --git a/src/pakfire/logger.py b/src/pakfire/logger.py
index 7fc14e238..2787f806e 100644
--- a/src/pakfire/logger.py
+++ b/src/pakfire/logger.py
@@ -24,9 +24,9 @@ import sys
 import systemd.journal
 import time
 
-def setup(name, syslog_identifier="pakfire", enable_console=True):
+def setup(name, level=logging.INFO, syslog_identifier="pakfire", enable_console=True):
 	log = logging.getLogger(name)
-	log.setLevel(logging.DEBUG)
+	log.setLevel(level)
 
 	# Do not propagate anything
 	log.propagate = False
@@ -34,7 +34,6 @@ def setup(name, syslog_identifier="pakfire", enable_console=True):
 	# Enable console output
 	if enable_console:
 		console = ConsoleHandler()
-		console.setLevel(logging.INFO)
 		log.addHandler(console)
 
 	# Enable logging to journald
diff --git a/src/scripts/pakfire-daemon.in b/src/scripts/pakfire-daemon.in
index fa7874b98..bc4ff6c77 100644
--- a/src/scripts/pakfire-daemon.in
+++ b/src/scripts/pakfire-daemon.in
@@ -35,6 +35,12 @@ class Cli(object):
 		parser.add_argument("--config", "-c", nargs="?",
 			default="@sysconfdir@/pakfire/daemon.conf",
 			help=_("Configuration file to load"))
+		parser.add_argument("--debug", action="store_true",
+			help=_("Enable debug mode"),
+		)
+		parser.add_argument("--verbose", action="store_true",
+			help=_("Enable logging output on the console"),
+		)
 
 		return parser.parse_args()
 
@@ -47,6 +53,8 @@ class Cli(object):
 		# Initialize the daemon
 		d = pakfire.daemon.Daemon(
 			args.config,
+			debug=args.debug,
+			verbose=args.verbose,
 		)
 
 		# Run it