Merge branch 'release/4.0.1'

Author: Bryan Donovan

History.md

@@ -1,3 +1,6 @@
+- 4.0.1
+  - Fix TTL option bug for memory cache (#194). - @anchan828
+
 - 4.0.0
   - Upgrade to lru-cache 7.x (#193). - @orgads
     - This has a breaking change in memoryCache.dump().

lib/stores/memory.js

@@ -30,11 +30,10 @@ var memoryStore = function(args) {
     self.usePromises = !(typeof Promise === 'undefined' || args.noPromises);
     self.shouldCloneBeforeSet = args.shouldCloneBeforeSet !== false; // clone by default
 
-    var ttl = args.ttl;
     var lruOpts = {
         max: args.max || 500,
         maxSize: args.maxSize,
-        ttl: (ttl || ttl === 0) ? ttl * 1000 : null,
+        ttl: (args.ttl || args.ttl === 0) ? args.ttl * 1000 : undefined,
         dispose: args.dispose,
         sizeCalculation: args.sizeCalculation || args.length,
         allowStale: args.allowStale || args.stale,
@@ -44,11 +43,11 @@ var memoryStore = function(args) {
 
     var lruCache = new Lru(lruOpts);
 
-    var setMultipleKeys = function setMultipleKeys(keysValues, maxAge) {
+    var setMultipleKeys = function setMultipleKeys(keysValues, ttl) {
         var length = keysValues.length;
         var values = [];
         for (var i = 0; i < length; i += 2) {
-            lruCache.set(keysValues[i], keysValues[i + 1], maxAge);
+            lruCache.set(keysValues[i], keysValues[i + 1], {ttl});
             values.push(keysValues[i + 1]);
         }
         return values;
@@ -65,9 +64,9 @@ var memoryStore = function(args) {
         }
         options = options || {};
 
-        var maxAge = (options.ttl || options.ttl === 0) ? options.ttl * 1000 : lruOpts.maxAge;
+        var ttl = (options.ttl || options.ttl === 0) ? options.ttl * 1000 : lruOpts.ttl;
 
-        lruCache.set(key, value, maxAge);
+        lruCache.set(key, value, {ttl});
         if (cb) {
             process.nextTick(cb.bind(null, null));
         } else if (self.usePromises) {
@@ -88,9 +87,9 @@ var memoryStore = function(args) {
             options = args.pop();
         }
 
-        var maxAge = (options.ttl || options.ttl === 0) ? options.ttl * 1000 : lruOpts.maxAge;
+        var ttl = (options.ttl || options.ttl === 0) ? options.ttl * 1000 : lruOpts.ttl;
 
-        var values = setMultipleKeys(args, maxAge);
+        var values = setMultipleKeys(args, ttl);
 
         if (cb) {
             process.nextTick(cb.bind(null, null));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cache-manager",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Cache module for Node.js",
   "main": "index.js",
   "files": [