verdnatura-mirror
/
loopback-datasource-juggler
mirror of https://github.com/loopbackio/loopback-datasource-juggler
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1072 from strongloop/bug/remove-expired-items-before-executing-expire 

Remove expired items before executing expire
This commit is contained in:
Simon Ho 2016-09-02 13:17:44 -07:00 committed by GitHub
parent 72200ce935 96cd8ff56b
commit 68294babdb
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/connectors/kv-memory.js
View File

@ -121,6 +121,8 @@ function(modelName, key, value, options, callback) {
KeyValueMemoryConnector.prototype.expire = KeyValueMemoryConnector.prototype.expire =
function(modelName, key, ttl, options, callback) { function(modelName, key, ttl, options, callback) {
this._removeIfExpired(modelName, key);
var store = this._getStoreForModel(modelName); var store = this._getStoreForModel(modelName);
if (!(key in store)) { if (!(key in store)) {

11
test/kvao/expire.suite.js
View File

@ -35,6 +35,17 @@ module.exports = function(dataSourceFactory, connectorCapabilities) {
.then(function(value) { should.equal(value, null); }); .then(function(value) { should.equal(value, null); });
}); });
it('returns error when expiring a key that has expired', function() {
return CacheItem.set('expired-key', 'a-value', 1).delay(20)
.then(function() { return CacheItem.expire('expired-key', 1000); })
.then(
function() { throw new Error('expire() should have failed'); },
function(err) {
err.message.should.match(/expired-key/);
err.should.have.property('statusCode', 404);
});
});
it('returns error when key does not exist', function() { it('returns error when key does not exist', function() {
return CacheItem.expire('key-does-not-exist', 1).then( return CacheItem.expire('key-does-not-exist', 1).then(
function() { throw new Error('expire() should have failed'); }, function() { throw new Error('expire() should have failed'); },