From 4d77233e0b270ed3e2d867ac10e825d95d00ec53 Mon Sep 17 00:00:00 2001
From: Jeffrey Campbell <jeffrey.campbell@autodesk.com>
Date: Fri, 24 Jun 2022 10:35:40 -0700
Subject: [PATCH 1/4] address PR feedback

---
 src/server/views/helpers/queueHelpers.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/server/views/helpers/queueHelpers.js b/src/server/views/helpers/queueHelpers.js
index 2e0f2e00..012b0e5f 100644
--- a/src/server/views/helpers/queueHelpers.js
+++ b/src/server/views/helpers/queueHelpers.js
@@ -31,12 +31,31 @@ function formatBytes(num) {
   return (neg ? '-' : '') + numStr + ' ' + unit;
 }
 
+function parseRedisServerInfo(redisServerInfo) {
+  if (typeof redisServerInfo !== 'string') {
+    return {};
+  }
+
+  const serverInfo = {};
+  const lines = redisServerInfo.split('\r\n')
+    .filter(line => !!line && !line.startsWith('#'))
+    .map(line => line.trim());
+  for (let i = 0; i < lines.length; ++i) {
+    const idx = line.indexOf(':');
+    if (idx > 0) {
+      serverInfo[line.substring(0, idx)] = line.substring(idx + 1);
+    }
+  }
+  return serverInfo;
+}
+
+
 const Helpers = {
   getStats: async function (queue) {
     const client = await queue.client;
-    await client.info(); // update queue.client.serverInfo
+    const info = await client.info();
 
-    const stats = _.pickBy(client.serverInfo, (value, key) =>
+    const stats = _.pickBy(parseRedisServerInfo(info), (value, key) =>
       _.includes(this._usefulMetrics, key)
     );
     stats.used_memory = formatBytes(parseInt(stats.used_memory, 10));

From a70fe5f41c1f65fe04ad667c1d17db692ac1fa66 Mon Sep 17 00:00:00 2001
From: Jeffrey Campbell <jeffrey.campbell@autodesk.com>
Date: Fri, 24 Jun 2022 10:39:49 -0700
Subject: [PATCH 2/4] prettier

---
 src/server/views/helpers/queueHelpers.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/views/helpers/queueHelpers.js b/src/server/views/helpers/queueHelpers.js
index 012b0e5f..6a48297b 100644
--- a/src/server/views/helpers/queueHelpers.js
+++ b/src/server/views/helpers/queueHelpers.js
@@ -37,9 +37,10 @@ function parseRedisServerInfo(redisServerInfo) {
   }
 
   const serverInfo = {};
-  const lines = redisServerInfo.split('\r\n')
-    .filter(line => !!line && !line.startsWith('#'))
-    .map(line => line.trim());
+  const lines = redisServerInfo
+    .split('\r\n')
+    .filter((line) => !!line && !line.startsWith('#'))
+    .map((line) => line.trim());
   for (let i = 0; i < lines.length; ++i) {
     const idx = line.indexOf(':');
     if (idx > 0) {
@@ -49,7 +50,6 @@ function parseRedisServerInfo(redisServerInfo) {
   return serverInfo;
 }
 
-
 const Helpers = {
   getStats: async function (queue) {
     const client = await queue.client;

From 6b52a214aa94153c6dee69351ee82f7e070d2074 Mon Sep 17 00:00:00 2001
From: Jeffrey Campbell <jeffrey.campbell@autodesk.com>
Date: Fri, 24 Jun 2022 12:12:49 -0700
Subject: [PATCH 3/4] clean up

---
 src/server/views/helpers/queueHelpers.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/server/views/helpers/queueHelpers.js b/src/server/views/helpers/queueHelpers.js
index 6a48297b..771d50a9 100644
--- a/src/server/views/helpers/queueHelpers.js
+++ b/src/server/views/helpers/queueHelpers.js
@@ -37,16 +37,16 @@ function parseRedisServerInfo(redisServerInfo) {
   }
 
   const serverInfo = {};
-  const lines = redisServerInfo
+  redisServerInfo
     .split('\r\n')
-    .filter((line) => !!line && !line.startsWith('#'))
-    .map((line) => line.trim());
-  for (let i = 0; i < lines.length; ++i) {
-    const idx = line.indexOf(':');
-    if (idx > 0) {
-      serverInfo[line.substring(0, idx)] = line.substring(idx + 1);
-    }
-  }
+    .filter((line) => !!line && !line.startsWith('#')) // remove comments and empty lines
+    .map((line) => line.trim())
+    .forEach((line) => {
+      const idx = line.indexOf(':');
+      if (idx > 0) {
+        serverInfo[line.substring(0, idx)] = line.substring(idx + 1);
+      }
+    });
   return serverInfo;
 }
 

From 58b6820a4578367e73d7c825af7ebd593c863ee0 Mon Sep 17 00:00:00 2001
From: Jeffrey Campbell <jeffrey.campbell@autodesk.com>
Date: Fri, 24 Jun 2022 12:30:27 -0700
Subject: [PATCH 4/4] flip filter and trim

---
 src/server/views/helpers/queueHelpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/views/helpers/queueHelpers.js b/src/server/views/helpers/queueHelpers.js
index 771d50a9..242ad8ad 100644
--- a/src/server/views/helpers/queueHelpers.js
+++ b/src/server/views/helpers/queueHelpers.js
@@ -39,8 +39,8 @@ function parseRedisServerInfo(redisServerInfo) {
   const serverInfo = {};
   redisServerInfo
     .split('\r\n')
-    .filter((line) => !!line && !line.startsWith('#')) // remove comments and empty lines
     .map((line) => line.trim())
+    .filter((line) => !!line && !line.startsWith('#')) // remove comments and empty lines
     .forEach((line) => {
       const idx = line.indexOf(':');
       if (idx > 0) {