From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 22 Apr 2023 10:14:43 +0000 (+0000)
Subject: logging: Use our own logger
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6acc7746b3296990a80237af8f22ff60f3921d5c;p=pbs.git

logging: Use our own logger

This is useful since we somehwat collided with the logger in the pakfire
module.

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

diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py
index 984be8aa..6a2e8326 100644
--- a/src/buildservice/__init__.py
+++ b/src/buildservice/__init__.py
@@ -34,7 +34,8 @@ from . import sources
 from . import uploads
 from . import users
 
-log = logging.getLogger("pakfire.buildservice")
+# Setup logging
+log = logging.getLogger("pbs")
 
 # Import version
 from .__version__ import VERSION as __version__
@@ -503,12 +504,6 @@ def setup_logging():
 	"""
 		Configures the logger for the buildservice backend
 	"""
-	# Do not propagate anything from the build service up to any Pakfire instances
-	log.propagate = 0
-
-	# Enable debug logging
-	log.setLevel(logging.DEBUG)
-
 	# Log everything to journal
 	handler = systemd.journal.JournalHandler(
 		SYSLOG_IDENTIFIER="pakfire-build-service",
diff --git a/src/buildservice/bugtracker.py b/src/buildservice/bugtracker.py
index 84df1413..f3693f92 100644
--- a/src/buildservice/bugtracker.py
+++ b/src/buildservice/bugtracker.py
@@ -30,7 +30,7 @@ from . import base
 from .decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.bugzilla")
+log = logging.getLogger("pbs.bugzilla")
 
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 
diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index ccf17403..8d47f9bf 100644
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -10,7 +10,7 @@ from . import base
 from .decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.builders")
+log = logging.getLogger("pbs.builders")
 
 class Builders(base.Object):
 	def _get_builder(self, query, *args):
diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index baaef8a4..12fbdeeb 100644
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -12,7 +12,7 @@ from .constants import *
 from .decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.builds")
+log = logging.getLogger("pbs.builds")
 
 class Builds(base.Object):
 	def _get_build(self, query, *args):
diff --git a/src/buildservice/config.py b/src/buildservice/config.py
index b509febb..61c61350 100644
--- a/src/buildservice/config.py
+++ b/src/buildservice/config.py
@@ -8,7 +8,7 @@ import pakfire
 from . import base
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.config")
+log = logging.getLogger("pbs.config")
 
 class PakfireConfig(base.Object):
 	def init(self, distro=None, repos=None, vendor=None, contact=None, mirrored=True):
diff --git a/src/buildservice/database.py b/src/buildservice/database.py
index 52882c28..2211ee43 100644
--- a/src/buildservice/database.py
+++ b/src/buildservice/database.py
@@ -13,7 +13,7 @@ import logging
 import psycopg2
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.database")
+log = logging.getLogger("pbs.database")
 
 class Connection(object):
 	"""
diff --git a/src/buildservice/distribution.py b/src/buildservice/distribution.py
index e01e4e36..8c1c4e96 100644
--- a/src/buildservice/distribution.py
+++ b/src/buildservice/distribution.py
@@ -9,7 +9,8 @@ from . import packages
 from . import sources
 from .decorators import *
 
-log = logging.getLogger("pakfire.buildservice.distros")
+# Setup logging
+log = logging.getLogger("pbs.distros")
 
 class Distributions(base.Object):
 	def _get_distribution(self, query, *args):
diff --git a/src/buildservice/events.py b/src/buildservice/events.py
index de1d9ef5..1d847190 100644
--- a/src/buildservice/events.py
+++ b/src/buildservice/events.py
@@ -22,10 +22,10 @@
 import logging
 
 from . import base
-
 from .decorators import *
 
-log = logging.getLogger("pakfire.buildservice.events")
+# Setup logging
+log = logging.getLogger("pbs.events")
 
 # Priorities (the higher, the more important)
 # ERROR          : 10
diff --git a/src/buildservice/jobqueue.py b/src/buildservice/jobqueue.py
index 57d99df5..b9fe34eb 100644
--- a/src/buildservice/jobqueue.py
+++ b/src/buildservice/jobqueue.py
@@ -4,7 +4,8 @@ import logging
 
 from . import base
 
-log = logging.getLogger("pakfire.buildservice.jobqueue")
+# Setup logging
+log = logging.getLogger("pbs.jobqueue")
 
 class JobQueue(base.Object):
 	# A list of all builders that have a connection
diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index c49e522e..8c47f083 100644
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -18,7 +18,7 @@ from .constants import *
 from .decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.jobs")
+log = logging.getLogger("pbs.jobs")
 
 class Jobs(base.Object):
 	def _get_job(self, query, *args):
diff --git a/src/buildservice/keys.py b/src/buildservice/keys.py
index 284ba8ee..1a37f1c1 100644
--- a/src/buildservice/keys.py
+++ b/src/buildservice/keys.py
@@ -10,7 +10,7 @@ from . import base
 from .decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.keys")
+log = logging.getLogger("pbs.keys")
 
 DEFAULT_ALGORITHM = "Ed25519"
 
diff --git a/src/buildservice/messages.py b/src/buildservice/messages.py
index 084637b7..55f8aec1 100644
--- a/src/buildservice/messages.py
+++ b/src/buildservice/messages.py
@@ -18,7 +18,7 @@ from .constants import TEMPLATESDIR
 from .decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.messages")
+log = logging.getLogger("pbs.messages")
 
 # Encode emails in UTF-8 by default
 email.charset.add_charset("utf-8", email.charset.SHORTEST, email.charset.QP, "utf-8")
diff --git a/src/buildservice/mirrors.py b/src/buildservice/mirrors.py
index fe713def..feeea0dc 100644
--- a/src/buildservice/mirrors.py
+++ b/src/buildservice/mirrors.py
@@ -15,7 +15,7 @@ from . import base
 from .decorators import lazy_property
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.mirrors")
+log = logging.getLogger("pbs.mirrors")
 
 class Mirrors(base.Object):
 	def init(self):
diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index d849acc9..ffbf873e 100644
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -19,7 +19,7 @@ from .decorators import *
 from .errors import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.packages")
+log = logging.getLogger("pbs.packages")
 
 class Packages(base.Object):
 	def _get_package(self, query, *args):
diff --git a/src/buildservice/repository.py b/src/buildservice/repository.py
index e0b4b51b..65a2b4bd 100644
--- a/src/buildservice/repository.py
+++ b/src/buildservice/repository.py
@@ -18,7 +18,7 @@ from .constants import *
 from .decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.repositories")
+log = logging.getLogger("pbs.repositories")
 
 # How long should a key be in active use for?
 KEY_LIFETIME      = datetime.timedelta(days=365)
diff --git a/src/buildservice/sources.py b/src/buildservice/sources.py
index 98b9805c..ca8caff0 100644
--- a/src/buildservice/sources.py
+++ b/src/buildservice/sources.py
@@ -19,7 +19,7 @@ from .constants import *
 from .decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.sources")
+log = logging.getLogger("pbs.sources")
 
 # Fetch only up to the last N commits
 GIT_DEPTH = 256
diff --git a/src/buildservice/uploads.py b/src/buildservice/uploads.py
index b873652b..1dc7c95a 100644
--- a/src/buildservice/uploads.py
+++ b/src/buildservice/uploads.py
@@ -14,7 +14,7 @@ from .constants import *
 from .decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.uploads")
+log = logging.getLogger("pbs.uploads")
 
 MAX_BUFFER_SIZE = 1 * 1024 * 1024 # 1 MiB
 
diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 7e4dc889..f717c541 100644
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -14,7 +14,7 @@ from . import base
 from .decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.builservice.users")
+log = logging.getLogger("pbs.users")
 
 # A list of LDAP attributes that we fetch
 LDAP_ATTRS = (
diff --git a/src/web/auth.py b/src/web/auth.py
index b86a3032..76a9c6b2 100644
--- a/src/web/auth.py
+++ b/src/web/auth.py
@@ -6,7 +6,7 @@ import tornado.web
 from . import base
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.web.auth")
+log = logging.getLogger("pbs.web.auth")
 
 class LoginHandler(base.KerberosAuthMixin, base.BaseHandler):
 	def get(self):
diff --git a/src/web/base.py b/src/web/base.py
index 32cbf3ce..77d79775 100644
--- a/src/web/base.py
+++ b/src/web/base.py
@@ -18,7 +18,7 @@ from .. import users
 from ..decorators import *
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.web.base")
+log = logging.getLogger("pbs.web.base")
 
 class KerberosAuthMixin(object):
 	"""
diff --git a/src/web/jobs.py b/src/web/jobs.py
index 510ca937..b57a46db 100644
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -8,7 +8,7 @@ from . import base
 from . import ui_modules
 
 # Setup logging
-log = logging.getLogger("pakfire.buildservice.web.jobs")
+log = logging.getLogger("pbs.web.jobs")
 
 class APIv1QueueHandler(base.APIMixin, tornado.websocket.WebSocketHandler):
 	"""