From 2e2c3ac1101b86fe8289fa5bca3b23a7a2848cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 9 Feb 2019 10:14:43 -0500 Subject: [PATCH] fix: #7352 --- src/database/redis.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/database/redis.js b/src/database/redis.js index 2828f84915..58a427d8c8 100644 --- a/src/database/redis.js +++ b/src/database/redis.js @@ -114,6 +114,9 @@ redisModule.connect = function (options, callback) { throw err; } }); + } else { + callbackCalled = true; + return callback(new Error('[[error:no-database-selected]]')); } return cxn; @@ -186,9 +189,11 @@ redisModule.info = function (cxn, callback) { }); const keyInfo = redisData['db' + nconf.get('redis:database')]; - redisData.keys = keyInfo.split(',')[0].replace('keys=', ''); - redisData.expires = keyInfo.split(',')[1].replace('expires=', ''); - redisData.avg_ttl = keyInfo.split(',')[2].replace('avg_ttl=', ''); + if (keyInfo) { + redisData.keys = keyInfo.split(',')[0].replace('keys=', ''); + redisData.expires = keyInfo.split(',')[1].replace('expires=', ''); + redisData.avg_ttl = keyInfo.split(',')[2].replace('avg_ttl=', ''); + } redisData.instantaneous_input = (redisData.instantaneous_input_kbps / 1024).toFixed(3); redisData.instantaneous_output = (redisData.instantaneous_output_kbps / 1024).toFixed(3);