From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 1 Dec 2016 16:26:57 +0000 (+0100)
Subject: Logging is now initialised on a module level
X-Git-Tag: 0.9.28~1285^2~1444
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd5f9ad8bc163ddc57cedcca73fb3e0d12d68188;p=pakfire.git

Logging is now initialised on a module level

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

diff --git a/src/pakfire/cli.py b/src/pakfire/cli.py
index ccea3ae79..4ad46bf66 100644
--- a/src/pakfire/cli.py
+++ b/src/pakfire/cli.py
@@ -30,7 +30,6 @@ from . import base
 from . import client
 from . import config
 from . import daemon
-from . import logger
 from . import packages
 from . import repository
 from . import server
@@ -41,10 +40,6 @@ from .system import system
 from .constants import *
 from .i18n import _
 
-# Initialize a very simple logging that is removed when a Pakfire instance
-# is started.
-logger.setup_logging()
-
 class Cli(object):
 	pakfire = base.Pakfire
 
@@ -1236,10 +1231,6 @@ class CliDaemon(Cli):
 		"""
 			Runs the pakfire daemon with provided settings.
 		"""
-		# Read the configuration file for the daemon.
-		self.config = config.ConfigDaemon()
-		logger.setup_logging(self.config)
-
 		# Create daemon instance.
 		d = daemon.PakfireDaemon(self.config)
 		try: