From 0bfa79e76272eda2d18f85f473d39a2a2781c3d1 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 28 Jan 2019 21:21:22 +0000 Subject: [PATCH] Update tryGet() and use default parameters --- lib/index.js | 6 +++--- lib/middleware/lru-cache.js | 4 ++-- lib/middleware/redis-cache.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/index.js b/lib/index.js index f97315be9e..36f1e637c2 100644 --- a/lib/index.js +++ b/lib/index.js @@ -94,11 +94,11 @@ if (config.cacheType === 'memory') { set: () => null, }; } -app.context.cache.tryGet = async function(key, getValueFunc, maxAge = 24 * 60 * 60) { - let v = await this.get(key); +app.context.cache.tryGet = async function(key, getValueFunc, maxAge = 24 * 60 * 60, persistent = false) { + let v = await this.get(key, persistent); if (!v) { v = await getValueFunc(); - this.set(key, v, maxAge); + this.set(key, v, maxAge, persistent); } else { let parsed; try { diff --git a/lib/middleware/lru-cache.js b/lib/middleware/lru-cache.js index bbf8fd68e2..3258890a27 100644 --- a/lib/middleware/lru-cache.js +++ b/lib/middleware/lru-cache.js @@ -26,7 +26,7 @@ module.exports = function(options = {}) { }); options.app.context.cache = { - get: (key, persistent) => { + get: (key, persistent = false) => { if (key) { if (persistent) { return persistentCache.get(key); @@ -35,7 +35,7 @@ module.exports = function(options = {}) { } } }, - set: (key, value, maxAge, persistent) => { + set: (key, value, maxAge, persistent = false) => { if (!value || value === 'undefined') { value = ''; } diff --git a/lib/middleware/redis-cache.js b/lib/middleware/redis-cache.js index 60b7df70e0..af9710210c 100644 --- a/lib/middleware/redis-cache.js +++ b/lib/middleware/redis-cache.js @@ -42,13 +42,13 @@ module.exports = function(options = {}) { options.app.context.cache = { /* eslint-disable no-unused-vars */ - get: async (key, persistent) => { + get: async (key, persistent = false) => { /* eslint-enable no-unused-vars */ if (key) { return await redisClient.get(key); } }, - set: async (key, value, maxAge, persistent) => { + set: async (key, value, maxAge, persistent = false) => { if (!value || value === 'undefined') { value = ''; }