Skip to content

add rate limiting to recurring jobs #2

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
nlf wants to merge 1 commit into
base: scripting
Choose a base branch
from
Open

add rate limiting to recurring jobs #2

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
2 changes: 1 addition & 1 deletion recurring.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Recurring.prototype.scriptdir = __dirname + '/scripts/recurring';
//config should have {timeout: seconds}
this.create = function(config, callback) {
config = JSON.stringify(config);
return this.runscript('create', [config], callback);
return this.runscript('create', [config, Date.now().toString()], callback);
};

this.exists = function(callback) {
Expand Down
5 changes: 3 additions & 2 deletions scripts/recurring/create.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
--name, config
local name = ARGV[1];
local config = cjson.decode(ARGV[2]);
local name, config, curtime = unpack(ARGV);
local config = cjson.decode(config);

redis.call('SET', 'recurring.lastcheck:'..name, curtime);
for key, value in pairs(config) do
redis.call('HSET', 'recurring.config:'..name, key, value);
end
Expand Down
5 changes: 5 additions & 0 deletions scripts/recurring/get.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@
local name, curtime = unpack(ARGV);

local r = redis.call('zrange', 'recurring:'..name, 0, 0, 'WITHSCORES');
local lastcheck = redis.call('GET', 'recurring.lastcheck:'..name);
local ratelimit = redis.call('HGET', 'recurring.config:'..name, 'ratelimit');
if(#r == 2) then
if(r[2] > curtime) then
return {"NOTYET", false, r[2]};
elseif(tonumber(curtime) < lastcheck + ratelimit) then
return {"NOTYET", false, lastcheck + ratelimit};
else
local timeout = redis.call('HGET', 'recurring.config:'..name, 'timeout');
redis.call('ZADD', 'recurring:'..name, curtime + timeout, r[1]);
redis.call('SET', 'recurring.lastcheck:'..name, curtime);
return {false, r[1], r[2]};
end
else
Expand Down