Breizh/haste-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rewrite the memcached client

Browse source 
* Update syntax to ES6
* Use `memcached` instead of `memcache`
* Fix restrictions where expirations weren't pushed forward on GET
* Fix a bug where we were unnecessarily bumping expirations on key search

Closes #201
This commit is contained in:
John Crepezzi 2018-02-16 09:52:44 -05:00
parent ad7702aaf4
commit 827e7b51b5
4 changed files with 51 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -156,9 +156,9 @@ All of which are optional except `type` with very logical default values.
### Memcached ### Memcached
To use memcached storage you must install the `memcache` package via npm To use memcache storage you must install the `memcached` package via npm
`npm install memcache` `npm install memcached`
Once you've done that, your config section should look like: Once you've done that, your config section should look like:

7
config.js
View file

@ -33,10 +33,9 @@
}, },
"storage": { "storage": {
"type": "redis", "type": "memcached",
"host": "0.0.0.0", "host": "127.0.0.1",
"port": 6379, "port": 11211,
"db": 2,
"expire": 2592000 "expire": 2592000
}, },

2
lib/document_handler.js
View file

@ -123,7 +123,7 @@ DocumentHandler.prototype.chooseKey = function(callback) {
} else { } else {
callback(key); callback(key);
} }
}); }, true); // Don't bump expirations when key searching
}; };
DocumentHandler.prototype.acceptableKey = function() { DocumentHandler.prototype.acceptableKey = function() {

67
lib/document_stores/memcached.js
View file

@ -1,45 +1,52 @@
var memcached = require('memcache'); const memcached = require('memcached');
var winston = require('winston'); const winston = require('winston');
class MemcachedDocumentStore {
// Create a new store with options // Create a new store with options
var MemcachedDocumentStore = function(options) { constructor(options) {
this.expire = options.expire; this.expire = options.expire;
if (!MemcachedDocumentStore.client) {
MemcachedDocumentStore.connect(options); const host = options.host || '127.0.0.1';
const port = options.port || 11211;
const url = `${host}:${port}`;
this.connect(url);
} }
};
// Create a connection // Create a connection
MemcachedDocumentStore.connect = function(options) { connect(url) {
var host = options.host || '127.0.0.1'; this.client = new memcached(url);
var port = options.port || 11211;
this.client = new memcached.Client(port, host); winston.info(`connecting to memcached on ${url}`);
this.client.connect();
this.client.on('connect', function() { this.client.on('failure', function(error) {
winston.info('connected to memcached on ' + host + ':' + port); winston.info('error connecting to memcached', {error});
}); });
this.client.on('error', function(e) { }
winston.info('error connecting to memcached', { error: e });
});
};
// Save file in a key // Save file in a key
MemcachedDocumentStore.prototype.set = set(key, data, callback, skipExpire) {
function(key, data, callback, skipExpire) { this.client.set(key, data, skipExpire ? 0 : this.expire, (error) => {
MemcachedDocumentStore.client.set(key, data, function(err) { callback(!error);
err ? callback(false) : callback(true); });
}, skipExpire ? 0 : this.expire); }
};
// Get a file from a key // Get a file from a key
MemcachedDocumentStore.prototype.get = function(key, callback, skipExpire) { get(key, callback, skipExpire) {
var _this = this; this.client.get(key, (error, data) => {
MemcachedDocumentStore.client.get(key, function(err, reply) { callback(error ? false : data);
callback(err ? false : reply);
if (_this.expire && !skipExpire) { // Update the key so that the expiration is pushed forward
winston.warn('store does not currently push forward expirations on GET'); if (!skipExpire) {
this.set(key, data, (updateSucceeded) => {
if (!updateSucceeded) {
winston.error('failed to update expiration on GET', {key});
}
}, skipExpire);
} }
}); });
}; }
}
module.exports = MemcachedDocumentStore; module.exports = MemcachedDocumentStore;