mirror of
https://github.com/SunRed/haste-server.git
synced 2024-11-01 01:30:21 +01:00
Merge pull request #203 from seejohnrun/rewrite_memcached
Rewrite the memcached client
This commit is contained in:
commit
7f625e22f7
4 changed files with 51 additions and 45 deletions
|
@ -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:
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -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() {
|
||||||
|
|
|
@ -1,45 +1,52 @@
|
||||||
var memcached = require('memcache');
|
const memcached = require('memcached');
|
||||||
var winston = require('winston');
|
const winston = require('winston');
|
||||||
|
|
||||||
// Create a new store with options
|
class MemcachedDocumentStore {
|
||||||
var MemcachedDocumentStore = function(options) {
|
|
||||||
|
// Create a new store with 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
|
||||||
|
set(key, data, callback, skipExpire) {
|
||||||
|
this.client.set(key, data, skipExpire ? 0 : this.expire, (error) => {
|
||||||
|
callback(!error);
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
|
|
||||||
// Save file in a key
|
// Get a file from a key
|
||||||
MemcachedDocumentStore.prototype.set =
|
get(key, callback, skipExpire) {
|
||||||
function(key, data, callback, skipExpire) {
|
this.client.get(key, (error, data) => {
|
||||||
MemcachedDocumentStore.client.set(key, data, function(err) {
|
callback(error ? false : data);
|
||||||
err ? callback(false) : callback(true);
|
|
||||||
}, skipExpire ? 0 : this.expire);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Get a file from a key
|
// Update the key so that the expiration is pushed forward
|
||||||
MemcachedDocumentStore.prototype.get = function(key, callback, skipExpire) {
|
if (!skipExpire) {
|
||||||
var _this = this;
|
this.set(key, data, (updateSucceeded) => {
|
||||||
MemcachedDocumentStore.client.get(key, function(err, reply) {
|
if (!updateSucceeded) {
|
||||||
callback(err ? false : reply);
|
winston.error('failed to update expiration on GET', {key});
|
||||||
if (_this.expire && !skipExpire) {
|
}
|
||||||
winston.warn('store does not currently push forward expirations on GET');
|
}, skipExpire);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
module.exports = MemcachedDocumentStore;
|
module.exports = MemcachedDocumentStore;
|
||||||
|
|
Loading…
Reference in a new issue