From 507d4c74a225e1b1c1e76ce5e0d1bd5e74d518df Mon Sep 17 00:00:00 2001
From: Keenan Brock <keenan@thebrocks.net>
Date: Fri, 26 May 2017 08:57:27 -0400
Subject: [PATCH] Use tracking label for logging

If there is a tracking label (new) then lets log this

Use the global MiqQueue#task_id for backwards compatibility.
---
 lib/gems/pending/util/vmdb-logger.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gems/pending/util/vmdb-logger.rb b/lib/gems/pending/util/vmdb-logger.rb
index 5d8e3b967..c799bb46c 100644
--- a/lib/gems/pending/util/vmdb-logger.rb
+++ b/lib/gems/pending/util/vmdb-logger.rb
@@ -159,8 +159,8 @@ def call(severity, time, progname, msg)
 
     def prefix_task_id(msg)
       # Add task id to the message if a task is currently being worked on.
-      if $_miq_worker_current_msg && !$_miq_worker_current_msg.task_id.nil?
-        prefix = "Q-task_id([#{$_miq_worker_current_msg.task_id}])"
+      if (task_id = (Thread.current["tracking_label"] || $_miq_worker_current_msg.try(:task_id)))
+        prefix = "Q-task_id([#{task_id}])"
         msg = "#{prefix} #{msg}" unless msg.include?(prefix)
       end