From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 Oct 2022 16:57:10 +0000 (+0000)
Subject: logging: Correctly set up loggers for all submodules
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a329017a46c2b7dcc45f5eac2c0b120e6a3def99;p=pbs.git

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 c56e7019..b2060dd0 100644
--- 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 032f5d49..93260c5f 100644
--- 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 fdc15ecc..4c701d82 100644
--- 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 d48410f0..efbc2272 100644
--- 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 1be298c7..9182436f 100644
--- 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 46a7b96e..55457ef1 100644
--- 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 9b74f4b9..5d5d984c 100644
--- 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 bcf57c2c..284ba8ee 100644
--- 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 91b203ac..c4a9edb5 100644
--- 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 d51fb2b3..4447f365 100644
--- 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 f5985e1e..2e64f0a1 100644
--- 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 4d62cbdd..51ae287a 100644
--- 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 677eaeab..4b8b8863 100644
--- 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 33dbbb1b..492e17fd 100644
--- 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)