From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 May 2022 08:37:44 +0000 (+0000)
Subject: logger: Use new logger setup in builder, too
X-Git-Tag: 0.9.28~738
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98e3d97820cf2994f12ca5f7d305f4837a3e12b1;p=pakfire.git

logger: Use new logger setup in builder, too

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

diff --git a/src/scripts/pakfire-builder.in b/src/scripts/pakfire-builder.in
index 1b9f4eb76..14efb61a8 100644
--- a/src/scripts/pakfire-builder.in
+++ b/src/scripts/pakfire-builder.in
@@ -20,10 +20,8 @@
 ###############################################################################
 
 import argparse
-import logging
 import os.path
 import sys
-import systemd.journal
 import tempfile
 import uuid
 
@@ -34,27 +32,6 @@ from pakfire.constants import CONFIG_DISTRO_DIR
 from pakfire.i18n import _
 
 class Cli(object):
-	@property
-	def logger(self):
-		log = logging.getLogger("pakfire.builder.cli")
-		log.setLevel(logging.DEBUG)
-
-		# Do not propagate anything
-		log.propagate = False
-
-		# Enable console output
-		console = pakfire.logger.ConsoleHandler()
-		console.setLevel(logging.INFO)
-		log.addHandler(console)
-
-		# Enable logging to journald
-		journal = systemd.journal.JournalHandler(
-			SYSLOG_IDENTIFIER="pakfire-builder",
-		)
-		log.addHandler(journal)
-
-		return log
-
 	def parse_cli(self):
 		parser = argparse.ArgumentParser(
 			description = _("Pakfire builder command line interface"),
@@ -168,12 +145,19 @@ class Cli(object):
 		# Find distro configuration file
 		conf = os.path.join(CONFIG_DISTRO_DIR, "%s.conf" % ns.distro)
 
+		# Setup logger
+		logger = pakfire.logger.setup(
+			"pakfire.builder.cli",
+			syslog_identifier="pakfire-builder",
+			enable_console=True,
+		)
+
 		return pakfire.Pakfire(
 			conf=conf,
 			arch=ns.arch,
 
 			# Set up logging
-			logger=self.logger.log,
+			logger=logger.log,
 			interactive=interactive,
 
 			# Enable build mode