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 7c84285288f573bf911853d31b0c9ebcc542ed67..a2990d2cec9ce4a6bc60538b663c1062014df972 100644 (file)
--- 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 695ca7f96f2e201f36a30c75ed23d458ae1fc7a9..644ca3737a12ab2283e3a438d11c1ee15bc4acef 100644 (file)
--- 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 917a4db7f8775c0456259719a2558b7d59561c3a..d656e5a8fca698226a6582d35a6de4bae1ddedb3 100644 (file)
--- 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 d937a95e87454bf40e026238ee8f511299c445c6..4553132e64a597a6151eb7fc88d45000601fb6ea 100644 (file)
--- 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 325a4c328acc77fc3af41795de2a3c86cfd848b5..e9921f8eaf098beeb53a235374e39ba93de35e85 100644 (file)
--- 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 *