Skip to content

Post a timer without overwrite #17

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
jayeheffernan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Post a timer without overwrite #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9beb61c
Post a timer without overwrite
jayeheffernan Sep 26, 2018
683cee8
Fix non-overwriting timers
jayeheffernan Oct 2, 2018
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
25 changes: 21 additions & 4 deletions lib/dtimer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,14 +209,25 @@ DTimer.prototype.leave = function (cb) {
.nodeify(cb);
};

DTimer.prototype.post = function (ev, delay, cb) {
DTimer.prototype.post = function (ev, delay, opts, cb) {
var self = this;
var evId;

if (typeof delay !== 'number') {
throw new Error('delay argument must be of type number');
}

// Parse the options
if (typeof opts === 'function') {
cb = opts;
opts = undefined;
}
if (opts === undefined) {
opts = {};
}
var updateTime = opts.updateTime == null ? true : opts.updateTime;
var updateMessage = opts.updateMessage == null ? true : opts.updateMessage;

// Copy event.
ev = JSON.parse(JSON.stringify(ev));

Expand Down Expand Up @@ -245,9 +256,15 @@ DTimer.prototype.post = function (ev, delay, cb) {

return this._redisTime()
.then(function (now) {
return self._pub.multi()
.zadd(self._keys.ei, now+delay, evId)
.hset(self._keys.ed, evId, msg)
var zaddArgs = [ self._keys.ei, now+delay, evId ];
if (!updateTime) {
zaddArgs.splice(1, 0, 'NX');
}
var multi = self._pub.multi()
return multi
.zadd.apply(multi, zaddArgs)
[updateMessage ? 'hset' : 'hsetnx'](self._keys.ed, evId, msg)
.hsetnx(self._keys.ed, evId, msg)
.evalsha(
scripts.update.sha,
5,
Expand Down