diff --git a/lib/keys.js b/lib/keys.js index f6cff1d..ebf5699 100644 --- a/lib/keys.js +++ b/lib/keys.js @@ -18,6 +18,7 @@ exports.del = function (mockInstance, keys, callback) { if (keys[i] in mockInstance.storage) { + clearTimeout(mockInstance.storage[keys[i]]._expire); delete mockInstance.storage[keys[i]]; keysDeleted++; diff --git a/lib/server.js b/lib/server.js index 5aa0550..0393b09 100644 --- a/lib/server.js +++ b/lib/server.js @@ -8,6 +8,10 @@ * flushdb */ exports.flushdb = flushdb = function (mockInstance, callback) { + for (var key in mockInstance.storage) { + clearTimeout(mockInstance.storage[key]._expire); + } + mockInstance.storage = {}; mockInstance._callCallback(callback, null, 'OK');