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 984be8aa8a003153f8c218a8422627dbe63c7206..6a2e8326afe1390469c5e123f61b8e00f783003a 100644 (file)
--- 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 84df1413c6e75cf2ea79f6468746c89d426c816e..f3693f92c5a313de9baa7d23c90acd725ae4f93e 100644 (file)
--- 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 ccf17403953a5156684ca8ef216a0879de05c948..8d47f9bfb20bc768989121606b907d7791700d4d 100644 (file)
--- 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 baaef8a4d95292c2fea17af5f2d711aab16d8799..12fbdeeb129533e9c7c823e37620ac66cf1d378e 100644 (file)
--- 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 b509febbe75026cea215a92b11d6f964c61129c0..61c61350d300243857523fbf77bdfa50430fd0f4 100644 (file)
--- 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 52882c28dd6ac83c02dd27fba88536a88ad5778b..2211ee43103b0029045bfa6cd6d7b72b12fca2d6 100644 (file)
--- 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 e01e4e3663fe995310f650bf9df45e3cd3e0a4f2..8c1c4e963756df6d461f8002d4105e9e5e5177fb 100644 (file)
--- 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 de1d9ef52e2f04b99f7b208093af0d02fe5b6f8e..1d847190f4307df8a5f990956859673b7e05b06b 100644 (file)
--- 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 57d99df597574aefb019bd8d416dee3f14ac7f78..b9fe34ebd467acd8ae8080d4ecba38e6d08ea037 100644 (file)
--- 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 c49e522e2376a0046a9d5bdcb41bcda0181e1cca..8c47f0839a41f7f22b2ec1cee170ec327f21cac2 100644 (file)
--- 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 284ba8ee892acca89e48df47e973b6a3fe51a2d8..1a37f1c1ac536b09ae8e7b14d6d8c8cdad021a26 100644 (file)
--- 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 084637b7ef44fc8f4ee2f3f655748dd32c5ec619..55f8aec154dac41a7e8e311a80b210c6d5b798e9 100644 (file)
--- 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 fe713def76735fc1f84b6bf03532b89bf993837c..feeea0dc7248279a5b8703fb8bd556dd07677f4a 100644 (file)
--- 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 d849acc97973ec11f652f463b0a62256ad8df7ca..ffbf873eb1d80f52447dfaafe6604ee345dc80bb 100644 (file)
--- 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 e0b4b51b624e81d55fc4ac523c749684144e64c9..65a2b4bdff591ee0afe8f458ba2db06c356429d2 100644 (file)
--- 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 98b9805ced92ca5c934fc3e2ed69b89f32aa62a6..ca8caff09d6aea9846d9c7b7528bf3884c62c785 100644 (file)
--- 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 b873652b08f50cc98289ac0bbf4f8910f7415975..1dc7c95a34b97975440d4acdc2e0e330b1eead10 100644 (file)
--- 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 7e4dc8895478f33f885cfbd29ce6116f24f2dba1..f717c5411f705573a2cfb70564425ac4eec87e40 100644 (file)
--- 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 b86a303246bd173a216f962b10a55eb7ef287b04..76a9c6b2fa77354839a817580d55cae188a90e74 100644 (file)
--- 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 32cbf3ce445b9b9f565eff7aa3ad73eb804bb883..77d79775439c755aef874bfe885cc6f983b6f161 100644 (file)
--- 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 510ca937daa6c8be63a94934b41fc189995a05c9..b57a46db10ce509531cce9191e2adc67b9ad7979 100644 (file)
--- 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):
        """