logging: Correctly set up loggers for all submodules

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

diff --git a/src/buildservice/bugtracker.py b/src/buildservice/bugtracker.py
index c56e7019aea992029e43f55b026157b320d26cf7..b2060dd07846e9d46400465bf81f624e1fc3a106 100644 (file)
--- a/src/buildservice/bugtracker.py
+++ b/src/buildservice/bugtracker.py
@@ -29,7 +29,8 @@ import urllib.parse
 from . import base
 from .decorators import *
 
-log = logging.getLogger("pakfire.bugzilla")
+# Setup logging
+log = logging.getLogger("pakfire.buildservice.bugzilla")
 
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index 032f5d49ac08daf53408b1ea221cf18869c21925..93260c5f6911d62070e528bf37852f3a279f4ba7 100644 (file)
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -15,7 +15,8 @@ from . import misc
 
 from .decorators import *
 
-log = logging.getLogger("pakfire.builders")
+# Setup logging
+log = logging.getLogger("pakfire.buildservice.builders")
 
 class Builders(base.Object):
        def _get_builder(self, query, *args):

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index fdc15eccb514b6c367d9a33cf0b0a2a335fb7a7d..4c701d8221465b069641861f3d8948edd74c77ec 100644 (file)
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -8,12 +8,12 @@ from . import base
 from . import logs
 from . import users
 
-log = logging.getLogger("builds")
-log.propagate = 1
-
 from .constants import *
 from .decorators import *
 
+# Setup logging
+log = logging.getLogger("pakfire.buildservice.builds")
+
 class Builds(base.Object):
        def _get_build(self, query, *args):
                res = self.db.get(query, *args)

diff --git a/src/buildservice/distribution.py b/src/buildservice/distribution.py
index d48410f0e768b9d5e00af33a789a72757bdc581a..efbc22724802c1059e7be125d9baa17a7bfb4558 100644 (file)
--- a/src/buildservice/distribution.py
+++ b/src/buildservice/distribution.py
@@ -9,7 +9,7 @@ from . import packages
 from . import sources
 from .decorators import *
 
-log = logging.getLogger("pakfire.distros")
+log = logging.getLogger("pakfire.buildservice.distros")
 
 class Distributions(base.Object):
        def _get_distribution(self, query, *args):

diff --git a/src/buildservice/events.py b/src/buildservice/events.py
index 1be298c71f88b25c9552bc0e2527eaa3e62e4762..9182436f574e0c331ad8da18d885d4dc000e157f 100644 (file)
--- a/src/buildservice/events.py
+++ b/src/buildservice/events.py
@@ -23,10 +23,10 @@ import logging
 
 from . import base
 
-log = logging.getLogger("pakfire.events")
-
 from .decorators import *
 
+log = logging.getLogger("pakfire.buildservice.events")
+
 class Events(base.Object):
        @lazy_property
        def map(self):

diff --git a/src/buildservice/jobqueue.py b/src/buildservice/jobqueue.py
index 46a7b96e767e840bbb3fdd05ceab8b1fd56cbfaf..55457ef1d2ba4a6bd4be1472068620582f441a01 100644 (file)
--- a/src/buildservice/jobqueue.py
+++ b/src/buildservice/jobqueue.py
@@ -5,8 +5,7 @@ import logging
 
 from . import base
 
-log = logging.getLogger("jobqueue")
-log.propagate = 1
+log = logging.getLogger("pakfire.buildservice.jobqueue")
 
 PENDING_STATE = "pending"
 

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index 9b74f4b9a74c8e1ef292dd623cd12c9bc2ffee82..5d5d984c7de961e26f241ab815bd3b1cfdcd9535 100644 (file)
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -10,9 +10,6 @@ import shutil
 import pakfire
 import pakfire.config
 
-log = logging.getLogger("builds")
-log.propagate = 1
-
 from . import base
 from . import logs
 from . import users
@@ -20,6 +17,9 @@ from . import users
 from .constants import *
 from .decorators import *
 
+# Setup logging
+log = logging.getLogger("pakfire.buildservice.jobs")
+
 class Jobs(base.Object):
        def _get_job(self, query, *args):
                res = self.db.get(query, *args)

diff --git a/src/buildservice/keys.py b/src/buildservice/keys.py
index bcf57c2c8b138c46585893aea15f144affd3f364..284ba8ee892acca89e48df47e973b6a3fe51a2d8 100644 (file)
--- a/src/buildservice/keys.py
+++ b/src/buildservice/keys.py
@@ -9,6 +9,7 @@ from . import base
 
 from .decorators import *
 
+# Setup logging
 log = logging.getLogger("pakfire.buildservice.keys")
 
 DEFAULT_ALGORITHM = "Ed25519"

diff --git a/src/buildservice/ldap.py b/src/buildservice/ldap.py
index 91b203ac6af9da350175ea0fa7531437264c6721..c4a9edb505bfa42bf60f64ef0bb2b114d1c7dd10 100644 (file)
--- a/src/buildservice/ldap.py
+++ b/src/buildservice/ldap.py
@@ -3,12 +3,12 @@
 import ldap
 import logging
 
-log = logging.getLogger("ldap")
-log.propagate = 1
-
 from . import base
 from .decorators import *
 
+# Setup logging
+log = logging.getLogger("pakfire.buildservice.ldap")
+
 class LDAP(base.Object):
        @lazy_property
        def ldap(self):

diff --git a/src/buildservice/mirrors.py b/src/buildservice/mirrors.py
index d51fb2b34123828119ea7389914abe20f7cd11a3..4447f3656c3e65ed4ccd18efee635a69804f072c 100644 (file)
--- a/src/buildservice/mirrors.py
+++ b/src/buildservice/mirrors.py
@@ -13,11 +13,11 @@ import location
 from . import base
 from . import logs
 
-log = logging.getLogger("mirrors")
-log.propagate = 1
-
 from .decorators import lazy_property
 
+# Setup logging
+log = logging.getLogger("pakfire.buildservice.mirrors")
+
 class Mirrors(base.Object):
        def init(self):
                self.location = location.Database("/var/lib/location/database.db")

diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index f5985e1ed0f652806672586547ff845142782efb..2e64f0a1896c02f71e9548ef186f34ac88edd151 100644 (file)
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -14,12 +14,12 @@ from . import base
 from . import database
 from . import misc
 
-log = logging.getLogger("packages")
-log.propagate = 1
-
 from .constants import *
 from .decorators import *
 
+# Setup logging
+log = logging.getLogger("pakfire.buildservice.packages")
+
 class Packages(base.Object):
        def _get_package(self, query, *args):
                res = self.db.get(query, *args)

diff --git a/src/buildservice/repository.py b/src/buildservice/repository.py
index 4d62cbddfc39bb38f583e2c5f8fd7646af58617d..51ae287a608289c4685568cf28af840fe43e0e06 100644 (file)
--- a/src/buildservice/repository.py
+++ b/src/buildservice/repository.py
@@ -9,8 +9,6 @@ import os.path
 
 import pakfire
 
-log = logging.getLogger("pakfire.buildservice.repositories")
-
 from . import base
 from . import logs
 from . import misc
@@ -18,6 +16,9 @@ from . import misc
 from .constants import *
 from .decorators import *
 
+# Setup logging
+log = logging.getLogger("pakfire.buildservice.repositories")
+
 # How long should a key be in active use for?
 KEY_LIFETIME      = datetime.timedelta(days=365)
 

diff --git a/src/buildservice/uploads.py b/src/buildservice/uploads.py
index 677eaeabcfd4bf5cc6541cb41f681ed504d49fec..4b8b88631fedbf7e86de19d28fed511e4bc5152e 100644 (file)
--- a/src/buildservice/uploads.py
+++ b/src/buildservice/uploads.py
@@ -9,7 +9,8 @@ from . import base
 from .constants import *
 from .decorators import *
 
-log = logging.getLogger("pakfire.uploads")
+# Setup logging
+log = logging.getLogger("pakfire.buildservice.uploads")
 
 class Uploads(base.Object):
        def _get_upload(self, query, *args):

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 33dbbb1b262e7738576564e28f4534fe90624593..492e17fd0712ea6ab4da84a4493093e46f9af770 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -8,14 +8,14 @@ import re
 
 import tornado.locale
 
-log = logging.getLogger("users")
-log.propagate = 1
-
 from . import base
 from . import ldap
 
 from .decorators import *
 
+# Setup logging
+log = logging.getLogger("pakfire.builservice.users")
+
 class Users(base.Object):
        def init(self):
                self.ldap = ldap.LDAP(self.backend)