From 5f1a63299072ed315f4cace73227492eb05c5c7e Mon Sep 17 00:00:00 2001
From: Pavel Tiunov <pavel.tiunov@gmail.com>
Date: Mon, 13 Apr 2020 20:03:40 -0700
Subject: [PATCH] fix: Consistent queryKey logging

---
 .../cubejs-query-orchestrator/orchestrator/QueryQueue.js     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js b/packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js
index 1208ad02628d9..bd365b8d462fa 100644
--- a/packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js
+++ b/packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js
@@ -241,7 +241,7 @@ class QueryQueue {
                     return redisClient.optimisticQueryUpdate(queryKey, { cancelHandler }, processingId);
                   } catch (e) {
                     this.logger(`Error while query update`, {
-                      queryKey,
+                      queryKey: query.queryKey,
                       error: e.stack || e,
                       queuePrefix: this.redisQueuePrefix,
                       requestId: query.requestId
@@ -305,7 +305,8 @@ class QueryQueue {
       } else {
         this.logger('Skip processing', {
           processingId,
-          queryKey,
+          queryKey: query && query.queryKey || queryKey,
+          requestId: query && query.requestId,
           queuePrefix: this.redisQueuePrefix,
           processingLockAcquired,
           query,