From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 20 Sep 2020 12:56:27 +0000 (+0000)
Subject: logging: Tidy up code and align with other projects
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16b84672f0c6e90eb2a5662c28771017c6328a4e;p=collecty.git

logging: Tidy up code and align with other projects

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

diff --git a/src/collecty/bus.py b/src/collecty/bus.py
index 7c84285..a2990d2 100644
--- a/src/collecty/bus.py
+++ b/src/collecty/bus.py
@@ -24,14 +24,13 @@ import dbus.mainloop.glib
 import dbus.service
 import gi.repository.GLib
 import gi.repository.GObject
+import logging
 import threading
 
 from .constants import *
 from .i18n import _
 
-import logging
 log = logging.getLogger("collecty.bus")
-log.propagate = 1
 
 class Bus(threading.Thread):
 	def __init__(self, collecty):
diff --git a/src/collecty/daemon.py b/src/collecty/daemon.py
index 695ca7f..644ca37 100644
--- a/src/collecty/daemon.py
+++ b/src/collecty/daemon.py
@@ -20,6 +20,7 @@
 ###############################################################################
 
 import datetime
+import logging
 import multiprocessing
 import os
 import queue
@@ -35,7 +36,6 @@ from . import plugins
 from .constants import *
 from .i18n import _
 
-import logging
 log = logging.getLogger("collecty")
 
 class Collecty(object):
@@ -258,7 +258,6 @@ class WorkerThread(threading.Thread):
 		self.daemon = True
 
 		self.log = logging.getLogger("collecty.worker")
-		self.log.propagate = 1
 
 		self.collecty = collecty
 		self.id = id
@@ -301,7 +300,6 @@ class WriteQueue(threading.Thread):
 		self.collecty = collecty
 
 		self.log = logging.getLogger("collecty.queue")
-		self.log.propagate = 1
 
 		self.timer = plugins.Timer(submit_interval)
 		self._queue = queue.PriorityQueue()
diff --git a/src/collecty/locales.py b/src/collecty/locales.py
index 917a4db..d656e5a 100644
--- a/src/collecty/locales.py
+++ b/src/collecty/locales.py
@@ -20,14 +20,13 @@
 ###############################################################################
 
 import gettext
+import logging
 import os
 
 from .constants import *
 from .i18n import TEXTDOMAIN
 
-import logging
 log = logging.getLogger("collecty.locale")
-log.propagate = 1
 
 class Locale(object):
 	def __init__(self, lang):
diff --git a/src/collecty/plugins/base.py b/src/collecty/plugins/base.py
index d937a95..4553132 100644
--- a/src/collecty/plugins/base.py
+++ b/src/collecty/plugins/base.py
@@ -150,7 +150,6 @@ class Plugin(object, metaclass=PluginRegistration):
 
 		# Initialize the logger.
 		self.log = logging.getLogger("collecty.plugins.%s" % self.name)
-		self.log.propagate = 1
 
 		self.data = []
 
diff --git a/src/collecty/util.py b/src/collecty/util.py
index 325a4c3..e9921f8 100644
--- a/src/collecty/util.py
+++ b/src/collecty/util.py
@@ -19,11 +19,10 @@
 #                                                                             #
 ###############################################################################
 
+import logging
 import os
 
-import logging
 log = logging.getLogger("collecty.util")
-log.propagate = 1
 
 from .constants import *