From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 2 Mar 2018 12:27:00 +0000 (+0100)
Subject: Revert "Revert "massage log messages""
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bea4c952f37cf445eb9cff734878e2ca13e42299;p=mirror%2Fdsa-puppet.git

Revert "Revert "massage log messages""

This reverts commit 0e6a2fddf5f78bc1bdeb2f95cc82e83a1b2e458f.
---

diff --git a/modules/bacula/files/dsa-bacula-scheduler b/modules/bacula/files/dsa-bacula-scheduler
index b14add32b..cefcb2b18 100755
--- a/modules/bacula/files/dsa-bacula-scheduler
+++ b/modules/bacula/files/dsa-bacula-scheduler
@@ -322,14 +322,14 @@ for t in TYPESL:
   run_cnt += len(current_backups[t])
   total_slots += max_jobs[t]
   if len(candidates[t]) == 0:
-    logger.info("No candidates for %s jobs", TYPES_COMPLETE_NAME[t])
+    logger.info("No candidates for %s(%s) jobs", t, TYPES_COMPLETE_NAME[t])
     continue
   free_slots = min(total_slots - run_cnt, total_free)
   if free_slots <= 0:
-    logger.info("No free slots for %s jobs but %d candidate(s)", TYPES_COMPLETE_NAME[t], len(candidates[t]))
+    logger.info("No free slots for %s(%s) jobs but %d candidate(s)", t, TYPES_COMPLETE_NAME[t], len(candidates[t]))
     continue
 
-  logger.info("Have %d candidate(s) and %d free slots for %s jobs.", len(candidates[t]), free_slots, TYPES_COMPLETE_NAME[t])
+  logger.info("Have %d candidate(s) and %d free slots for %s(%s) jobs.", len(candidates[t]), free_slots, t, TYPES_COMPLETE_NAME[t])
   picked = random.sample(candidates[t], min(free_slots, len(candidates[t])))
   for p in picked:
     logger.info("  Will run: %s/%s", p['client'], p['level'])