Skip to content

Replace hmset/expire/hgetall with set/get #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshk0 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace hmset/expire/hgetall with set/get #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions lib/ExpressRedisCache/add.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,24 @@ module.exports = (function () {
var prefix = self.prefix.match(/:$/) ? self.prefix.replace(/:$/, '')
: self.prefix;

/* Save as a Redis hash */
/** Serialize the entry to JSON so it can be stored as a regular key's value. */
var redisKey = prefix + ':' + name;
self.client.hmset(redisKey, entry,
var args = [redisKey, JSON.stringify(entry)];

/** If @expire then tell Redis to expire **/
if (typeof entry.expire === 'number' && entry.expire > 0) {
args.push('EX', entry.expire);
}

self.client.set(args,
domain.intercept(function (res) {
var calculated_size = (size / 1024).toFixed(2);
/** If @expire then tell Redis to expire **/
if ( typeof entry.expire === 'number' && entry.expire > 0 ) {
self.client.expire(redisKey, +entry.expire,
domain.intercept(function () {
self.emit('message', require('util').format('SET %s ~%d Kb %d TTL (sec)', redisKey, calculated_size, +entry.expire));
callback(null, name, entry, res);
}));
}
else
{
self.emit('message', require('util').format('SET %s ~%d Kb', redisKey, calculated_size));
callback(null, name, entry, res);
var msg = require('util').format('SET %s ~%d Kb', redisKey, calculated_size);
if (typeof entry.expire === 'number' && entry.expire > 0) {
msg += require('util').format(' %d TTL (sec)', +entry.expire);
}
self.emit('message', msg);
callback(null, name, entry, res);
}));
});
}
Expand Down
6 changes: 5 additions & 1 deletion lib/ExpressRedisCache/get.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,15 @@ module.exports = (function () {
var hasWildcard = redisKey.indexOf('*') >= 0;

var fetchKey = function (key, cb) {
self.client.hgetall(key, domain.intercept(function (result) {
self.client.get(key, domain.intercept(function (result) {
if ( result ) {
/** Deserialize the result from JSON. */
result = JSON.parse(result);

var names = key.split(':');
result.name = names[1];
result.prefix = names[0];

self.emit('message', require('util').format('GET %s ~%d Kb', key,
(require('../sizeof')(result) / 1024).toFixed(2)));
}
Expand Down
3 changes: 2 additions & 1 deletion test/add.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
var host = process.env.EX_RE_CA_HOST || 'localhost';
var port = process.env.EX_RE_CA_PORT || 6379;

var _noexpire = "i don't expire";
var _name = 'test1';
var _body = 'test1 test1 test1';
var _type = 'text/plain';
Expand Down Expand Up @@ -44,7 +45,7 @@
});

it ( 'should allow for zero expiration', function(done) {
cache.add(_name, _body, { expire: 0 },
cache.add(_noexpire, _body, { expire: 0 },
function($error, $name, $entry) {
var resp;
if($entry.expire !== 0) {
Expand Down