Merge 5cb0f0b into 02a0cc0

CatalysmsServerManager · Jun 9, 2020 · ac932b2 · ac932b2
2 parents 02a0cc0 + 5cb0f0b
commit ac932b2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/api/controllers/CustomHook/get-custom-hook.js b/api/controllers/CustomHook/get-custom-hook.js
@@ -42,7 +42,6 @@ module.exports = {
 
       response = response.map(async hook => {
         hook.lastResult = await sails.helpers.redis.get(`hooks:${hook.id}:lastResult`);
-
         if (!_.isNull(hook.lastResult) && sails.helpers.etc.isJson(hook.lastResult)) {
           hook.lastResult = JSON.parse(hook.lastResult);
         }
@@ -61,6 +60,7 @@ module.exports = {
       response = result;
       response.lastResult = await sails.helpers.redis.get(`hooks:${response.id}:lastResult`);
 
+
       if (!_.isNull(response.lastResult) && sails.helpers.etc.isJson(response.lastResult)) {
         response.lastResult = JSON.parse(response.lastResult);
       }

diff --git a/api/helpers/redis/del.js b/api/helpers/redis/del.js
@@ -25,7 +25,7 @@ module.exports = {
   fn: async function (inputs, exits) {
 
     const datastore = sails.getDatastore('cache');
-    if (datastore.adapter === 'sails-redis') {
+    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);

diff --git a/api/helpers/redis/get.js b/api/helpers/redis/get.js
@@ -24,7 +24,7 @@ module.exports = {
 
   fn: async function (inputs, exits) {
     const datastore = sails.getDatastore('cache');
-    if (datastore.adapter === 'sails-redis') {
+    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);
@@ -40,7 +40,7 @@ module.exports = {
       if (!sails.cache) {
         sails.cache = {};
       }
-      return exits.success(sails.cache[inputs.keyString]);
+      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
@@ -24,7 +24,7 @@ module.exports = {
 
   fn: async function (inputs, exits) {
     const datastore = sails.getDatastore('cache');
-    if (datastore.adapter === 'sails-redis') {
+    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);

diff --git a/api/helpers/redis/lrange.js b/api/helpers/redis/lrange.js
@@ -36,7 +36,7 @@ module.exports = {
 
   fn: async function (inputs, exits) {
     const datastore = sails.getDatastore('cache');
-    if (datastore.adapter === 'sails-redis') {
+    if (datastore.config.adapter === 'sails-redis') {
       sails.getDatastore('cache').leaseConnection(function during(redisConnection, proceed) {
         redisConnection.lrange(inputs.keyString, inputs.startIndex, inputs.endIndex, (err, reply) => {
           if (err) return proceed(err);

diff --git a/api/helpers/redis/rpush.js b/api/helpers/redis/rpush.js
@@ -30,7 +30,7 @@ module.exports = {
   fn: async function (inputs, exits) {
 
     const datastore = sails.getDatastore('cache');
-    if (datastore.adapter === 'sails-redis') {
+    if (datastore.config.adapter === 'sails-redis') {
       sails.getDatastore('cache').leaseConnection(function during(redisConnection, proceed) {
         redisConnection.rpush(inputs.keyString, inputs.value, (err, reply) => {
           if (err) return proceed(err);

diff --git a/api/helpers/redis/set.js b/api/helpers/redis/set.js
@@ -37,7 +37,7 @@ module.exports = {
 
   fn: async function (inputs, exits) {
     const datastore = sails.getDatastore('cache');
-    if (datastore.adapter === 'sails-redis') {
+    if (datastore.config.adapter === 'sails-redis') {
       if (inputs.ex) {
         if (_.isUndefined(inputs.ttl)) {
           return exits.error(`When setting ex true you must provide a TTL.`)