From d6beb77397f596dbd333975d31b6f3af02ea8f6d Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@free.fr>
Date: Sat, 25 Jan 2020 12:28:20 +0100
Subject: Enhance some logging messages

Change-Id: I257a3592643a716cd88efc255150a603d89d108a
---
 tests/base.py           | 13 ++++++++++---
 zuul/executor/server.py |  2 +-
 zuul/lib/gearworker.py  |  6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/base.py b/tests/base.py
index aa43ab2e7..527bdf66c 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -2659,8 +2659,11 @@ class RecordingExecutorServer(zuul.executor.server.ExecutorServer):
 
         """
         builds = self.running_builds[:]
-        self.log.debug("Releasing build %s (%s)" % (regex,
-                                                    len(self.running_builds)))
+        if len(builds) == 0:
+            self.log.debug('No running builds to release')
+            return
+
+        self.log.debug("Releasing build %s (%s)" % (regex, len(builds)))
         for build in builds:
             if not regex or re.match(regex, build.name):
                 self.log.debug("Releasing build %s" %
@@ -2670,7 +2673,7 @@ class RecordingExecutorServer(zuul.executor.server.ExecutorServer):
                 self.log.debug("Not releasing build %s" %
                                (build.parameters['zuul']['build']))
         self.log.debug("Done releasing builds %s (%s)" %
-                       (regex, len(self.running_builds)))
+                       (regex, len(builds)))
 
     def executeJob(self, job):
         build = FakeBuild(self, job)
@@ -4599,6 +4602,10 @@ class ZuulTestCase(BaseTestCase):
         completed.
 
         """
+        if not self.history:
+            self.log.debug("Build history: no builds ran")
+            return
+
         self.log.debug("Build history:")
         for build in self.history:
             self.log.debug(build)
diff --git a/zuul/executor/server.py b/zuul/executor/server.py
index 65690a5a6..24e93f4fe 100644
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@@ -2671,7 +2671,7 @@ class ExecutorServer(BaseMergeServer):
         self.command_thread.daemon = True
         self.command_thread.start()
 
-        self.log.debug("Starting workers")
+        self.log.debug("Starting %s update workers" % self.update_workers)
         for i in range(self.update_workers):
             update_thread = threading.Thread(target=self._updateLoop,
                                              name='update')
diff --git a/zuul/lib/gearworker.py b/zuul/lib/gearworker.py
index 1bffbd4de..1e1433692 100644
--- a/zuul/lib/gearworker.py
+++ b/zuul/lib/gearworker.py
@@ -51,18 +51,18 @@ class ZuulGearWorker:
                                self.ssl_cert, self.ssl_ca,
                                keepalive=True, tcp_keepidle=60,
                                tcp_keepintvl=30, tcp_keepcnt=5)
-        self.log.debug('Waiting for server')
+        self.log.debug('Waiting for gearman')
         self.gearman.waitForServer()
         self.register()
         self.thread.start()
 
     def register(self):
-        self.log.debug('Registering jobs')
+        self.log.debug('Registering %s jobs' % len(self.jobs))
         for job in self.jobs:
             self.gearman.registerFunction(job)
 
     def unregister(self):
-        self.log.debug('Unregistering jobs')
+        self.log.debug('Unregistering all jobs (%s)' % len(self.jobs))
         for job in self.jobs:
             self.gearman.unRegisterFunction(job)
 
-- 
cgit v1.2.1