From 5af8641fe4c32221490bc0fc0789a164f675ac57 Mon Sep 17 00:00:00 2001
From: Nell Gawor <ngawor@us.ibm.com>
Date: Fri, 9 Sep 2016 16:55:01 -0400
Subject: [PATCH] guard redis error handler

---
 src/scripts/redis.delete.js  | 21 ++++++++++++---------
 src/scripts/redis.nottls.js  |  2 --
 src/scripts/redis.slowlog.js | 20 +++++++++++---------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/scripts/redis.delete.js b/src/scripts/redis.delete.js
index 702dee7..cf3f98e 100644
--- a/src/scripts/redis.delete.js
+++ b/src/scripts/redis.delete.js
@@ -39,15 +39,18 @@ let currentResponse;
 
 module.exports = (robot) => {
 
-	redis.on('error', function(err) {
-		if (currentResponse) {
-			let message = i18n.__('redis.error', err);
-			robot.emit('ibmcloud.formatter', {
-				response: currentResponse,
-				message: message
-			});
-		}
-	});
+	if (redis) {
+		redis.on('error', function(err) {
+			if (currentResponse) {
+				let message = i18n.__('redis.error', err);
+				robot.emit('ibmcloud.formatter', {
+					response: currentResponse,
+					message: message
+				});
+			}
+		});
+	}
+
 	// Natural Language match
 	robot.on(DELETE_ID, (res) => {
 		robot.logger.debug(`${TAG}: ${DELETE_ID} - Natural Language match - res.message.text=${res.message.text}.`);
diff --git a/src/scripts/redis.nottls.js b/src/scripts/redis.nottls.js
index 50d6828..c7b494c 100644
--- a/src/scripts/redis.nottls.js
+++ b/src/scripts/redis.nottls.js
@@ -119,8 +119,6 @@ module.exports = (robot) => {
 
 	function processMonitorNoTtlsWrapper(res) {
 		if (currentMonitor) {
-			// return, I'm already monitoring so I can't help you
-			// this is a stopgap until we can get true multi-user support in place
 			let warning = i18n.__('monitor.ttls.busy');
 			robot.emit('ibmcloud.formatter', {
 				response: res,
diff --git a/src/scripts/redis.slowlog.js b/src/scripts/redis.slowlog.js
index 07c3f78..0fa1e1f 100644
--- a/src/scripts/redis.slowlog.js
+++ b/src/scripts/redis.slowlog.js
@@ -36,15 +36,17 @@ let lastResponse;
 
 module.exports = (robot) => {
 
-	redis.on('error', function(err) {
-		if (lastResponse) {
-			let message = i18n.__('redis.error', err);
-			robot.emit('ibmcloud.formatter', {
-				response: lastResponse,
-				message: message
-			});
-		}
-	});
+	if (redis) {
+		redis.on('error', function(err) {
+			if (lastResponse) {
+				let message = i18n.__('redis.error', err);
+				robot.emit('ibmcloud.formatter', {
+					response: lastResponse,
+					message: message
+				});
+			}
+		});
+	}
 
 	// Natural Language match
 	robot.on(SLOWLOG_ID, (res) => {