fixes #36

kwhitley · Sep 14, 2016 · 5e398bc · 5e398bc
1 parent 9cda4e0
commit 5e398bc
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/apicache.js b/lib/apicache.js
@@ -23,6 +23,8 @@ function ApiCache() {
     redisClient:        false
   };
 
+  var instance = this;
+
   var index = null;
 
   this.clear = function(target) {
@@ -48,7 +50,7 @@ function ApiCache() {
       delete index.groups[target];
     } else if (target) {
       if (globalOptions.debug) {
-        console.log('[api-cache]: clearing key: ', target);
+        console.log('[api-cache]: clearing cached entry for "' + target + '"');
       }
       if (!globalOptions.redisClient) {
         memCache.del(target);
@@ -86,6 +88,8 @@ function ApiCache() {
   };
 
   this.middleware = function cache(duration, middlewareToggle) {
+    var strDuration = duration;
+
     if (typeof duration === 'string') {
       var split = duration.match(/^(\d+)\s(\w+)$/);
 
@@ -204,7 +208,7 @@ function ApiCache() {
           if (!memCache.get(key) && !req.headers['x-apicache-bypass']) {
             if (req.apicacheGroup) {
               if (globalOptions.debug) {
-                console.log('[api-cache]: group detected: ' + req.apicacheGroup);
+                console.log('[api-cache]: group detected "' + req.apicacheGroup + '"');
               }
               index.groups[req.apicacheGroup] = index.groups[req.apicacheGroup] || [];
               index.groups[req.apicacheGroup].push(key);
@@ -213,7 +217,7 @@ function ApiCache() {
             index.all.push(key);
 
             if (globalOptions.debug) {
-              console.log('[api-cache]: adding cache entry for "' + key + '" @ ' + duration + ' milliseconds');
+              console.log('[api-cache]: adding cache entry for "' + key + '" @ ' + strDuration);
             }
 
             _.each(['Cache-Control', 'Expires', 'Content-Encoding'], function(h) {
@@ -229,6 +233,8 @@ function ApiCache() {
               globalOptions.redisClient.hset(key, "responseObj", JSON.stringify(responseObj));
               globalOptions.redisClient.hset(key, "duration", duration);
             }
+
+            setTimeout(function() { instance.clear(key) }, duration);
           }
 
           return res.realSend(responseObj.body);