Search completion; better SimpleCache.

SimpleCache should reset the timer very time it's rotated (including
when the allowed number of entries is exceeded.

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/utils.coffee b/lib/utils.coffee
index 07528714..1b2a7a3f 100644
--- a/lib/utils.coffee
+++ b/lib/utils.coffee
@@ -211,16 +211,18 @@ globalRoot.extend = (hash1, hash2) ->
 # they are discarded.
 class SimpleCache
   # expiry: expiry time in milliseconds (default, one hour)
-  # entries: maximum number of entries
+  # entries: maximum number of entries in @cache (there may be this many entries in @previous, too)
   constructor: (@expiry = 60 * 60 * 1000, @entries = 1000) ->
     @cache = {}
-    @previous = {}
-    rotate = => @rotate()
-    setInterval rotate, @expiry
+    @rotate() # Force starts the rotation timer.
 
   rotate: ->
     @previous = @cache
     @cache = {}
+    # We reset the timer every time the cache is rotated (which could be because a previous timer expired, or
+    # because the number of @entries was exceeded.
+    clearTimeout @timer if @timer?
+    @timer = Utils.setTimeout @expiry, => @rotate()
 
   has: (key) ->
     (key of @cache) or key of @previous