]> git.ipfire.org Git - people/stevee/pakfire.git/commitdiff
daemon: Drop workers logger and use daemon logger
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 23 Oct 2022 20:03:45 +0000 (20:03 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 23 Oct 2022 20:03:45 +0000 (20:03 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/pakfire/daemon.py

index 7e06c30315639e8d77f01f351ba81d7d174080d0..c6924c05f2807751e508ed8430dcd7d5e5fd27d2 100644 (file)
@@ -173,11 +173,7 @@ class Daemon(object):
                self.log.debug("%s" % json.dumps(job, sort_keys=True, indent=4))
 
                # Launch a new worker
-               worker = Worker(
-                       self.hub,
-                       job,
-                       debug=self.debug,
-               )
+               worker = Worker(self, job)
                self.workers.append(worker)
 
                # Run it
@@ -187,21 +183,16 @@ class Daemon(object):
 
 
 class Worker(multiprocessing.Process):
-       def __init__(self, hub, data, debug=False):
+       def __init__(self, daemon, data):
                multiprocessing.Process.__init__(self)
+               self.daemon = daemon
 
-               self.hub = hub
+               self.hub = self.daemon.hub
+               self.log = self.daemon.log
 
                # The job that has been received
                self.data = data
 
-               # Setup a logger
-               self.log = logger.setup(
-                       "pakfire.daemon.worker.%s" % self.pid,
-                       level=logging.DEBUG if debug else logging.INFO,
-                       syslog_identifier="pakfire-worker",
-               )
-
        def run(self):
                self.log.debug("Worker %s has launched" % self.pid)