added __heartbeat__

server/storage.js

@@ -14,7 +14,8 @@ const log = mozlog('portal.storage');
 
 const redis = require('redis');
 const redis_client = redis.createClient({
-  host: conf.redis_host
+  host: conf.redis_host,
+  connect_timeout: 10000
 });
 
 redis_client.on('error', err => {
@@ -29,7 +30,8 @@ if (notLocalHost) {
     get: awsGet,
     set: awsSet,
     delete: awsDelete,
-    forceDelete: awsForceDelete
+    forceDelete: awsForceDelete,
+    ping: awsPing
   };
 } else {
   module.exports = {
@@ -39,7 +41,8 @@ if (notLocalHost) {
     get: localGet,
     set: localSet,
     delete: localDelete,
-    forceDelete: localForceDelete
+    forceDelete: localForceDelete,
+    ping: localPing
   };
 }
 
@@ -120,6 +123,14 @@ function localForceDelete(id) {
   });
 }
 
+function localPing() {
+  return new Promise((resolve, reject) => {
+    redis_client.ping(err => {
+      return err ? reject() : resolve();
+    });
+  });
+}
+
 function awsLength(id) {
   const params = {
     Bucket: conf.s3_bucket,
@@ -211,3 +222,9 @@ function awsForceDelete(id) {
     });
   });
 }
+
+function awsPing() {
+  return localPing().then(() =>
+    s3.headBucket({ Bucket: conf.s3_bucket }).promise()
+  );
+}