Revert "Refactor redis helpers to use in memory cache"

This reverts commit bf6de9d.
CatalysmsServerManager · Jun 20, 2020 · 2138d66 · 2138d66
1 parent bd1c957
commit 2138d66
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 14 deletions.
diff --git a/api/helpers/redis/del.js b/api/helpers/redis/del.js
@@ -24,9 +24,25 @@ module.exports = {
 
   fn: async function (inputs, exits) {
 
-    await sails.helpers.redis.ensureCacheExists();
+    const datastore = sails.getDatastore('cache');
+    if (datastore.config.adapter === 'sails-redis') {
+      sails.getDatastore('cache').leaseConnection(function during(redisConnection, proceed) {
+        redisConnection.del(inputs.keyString, (err, reply) => {
+          if (err) return proceed(err);
+
+          return proceed(undefined, reply)
+        });
+      }).exec((err, result) => {
+        if (err) return exits.error(err);
+
+        return exits.success(result);
+      });
+    } else {
+      sails.cache[inputs.keyString] = null;
+      return exits.success();
+    }
+
+
 
-    sails.cache[inputs.keyString] = null;
-    return exits.success();
   }
 };
diff --git a/api/helpers/redis/get.js b/api/helpers/redis/get.js
@@ -23,11 +23,26 @@ module.exports = {
 
 
   fn: async function (inputs, exits) {
+    const datastore = sails.getDatastore('cache');
+    if (datastore.config.adapter === 'sails-redis') {
+      sails.getDatastore('cache').leaseConnection(function during(redisConnection, proceed) {
+        redisConnection.get(inputs.keyString, (err, reply) => {
+          if (err) return proceed(err);
+
+          return proceed(undefined, reply)
+        });
+      }).exec((err, result) => {
+        if (err) return exits.error(err);
+
+        return exits.success(result);
+      });
+    } else {
+      if (!sails.cache) {
+        sails.cache = {};
+      }
+      return exits.success(sails.cache[inputs.keyString] ? sails.cache[inputs.keyString] : null);
+    }
 
-    await sails.helpers.redis.ensureCacheExists();
-
-    return exits.success(sails.cache[inputs.keyString] ? sails.cache[inputs.keyString] : null);
   }
-
 };
 
diff --git a/api/helpers/redis/incr.js b/api/helpers/redis/incr.js
@@ -23,13 +23,21 @@ module.exports = {
 
 
   fn: async function (inputs, exits) {
-
-    await sails.helpers.redis.ensureCacheExists();
-
-    if (!sails.cache[inputs.keyString]) {
-      sails.cache[inputs.keyString] = 0;
+    const datastore = sails.getDatastore('cache');
+    if (datastore.config.adapter === 'sails-redis') {
+      sails.getDatastore('cache').leaseConnection(function during(redisConnection, proceed) {
+        redisConnection.incr(inputs.keyString, (err, reply) => {
+          if (err) return proceed(err);
+
+          return proceed(undefined, reply)
+        });
+      }).exec((err, result) => {
+        if (err) return exits.error(err);
+
+        return exits.success(result);
+      });
+    } else {
+      return exits.success(sails.cache[inputs.keyString]++);
     }
-
-    return exits.success(sails.cache[inputs.keyString]++);
   }
 };