add timeout to redis commands so that the health api endpoint will return a value

Author: NickOvt

lib/api/health.js

@@ -75,7 +75,8 @@ module.exports = (db, server, loggelf) => {
 
             // 3) test redis PING
             try {
-                await db.redis.ping();
+                // Redis might try to reconnect causing a situation where given ping() command might never return a value, add a fixed timeout
+                await promiseRaceTimeoutWrapper(db.redis.ping(), 10000);
             } catch (err) {
                 loggelf({
                     short_message: '[HEALTH] Redis is down. PING to Redis failed.'
@@ -90,14 +91,15 @@ module.exports = (db, server, loggelf) => {
 
             // 4) test if redis is writeable
             try {
-                await db.redis.hset('health', `${currentTimestamp}`, `${currentTimestamp}`);
-                const data = await db.redis.hget(`health`, `${currentTimestamp}`);
+                await promiseRaceTimeoutWrapper(db.redis.hset('health', `${currentTimestamp}`, `${currentTimestamp}`), 10000);
+
+                const data = await promiseRaceTimeoutWrapper(db.redis.hget(`health`, `${currentTimestamp}`), 10000);
 
                 if (data !== `${currentTimestamp}`) {
                     throw Error('Received data is not the same!');
                 }
 
-                await db.redis.hdel('health', `${currentTimestamp}`);
+                await promiseRaceTimeoutWrapper(db.redis.hdel('health', `${currentTimestamp}`), 10000);
             } catch (err) {
                 loggelf({
                     short_message:
@@ -116,3 +118,12 @@ module.exports = (db, server, loggelf) => {
         })
     );
 };
+
+async function promiseRaceTimeoutWrapper(promise, timeout) {
+    return Promise.race([
+        promise,
+        new Promise((_resolve, reject) => {
+            setTimeout(() => reject(new Error('Async call timed out!')), timeout);
+        })
+    ]);
+}