From 331e972f114370025941afb9352bee592c77d4c2 Mon Sep 17 00:00:00 2001 From: haoxin Date: Mon, 11 Apr 2016 19:01:18 +0800 Subject: [PATCH 1/3] travis: add node@5 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04b39cd..f545ef6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,10 @@ language: node_js node_js: - "0.10" - "0.12" - - "4.2" + - "4" + - "5" services: - - redis-server + - redis-server install: - npm install script: From 9205a0aa11b6b4290c624c2e18b09b0f42d6f85a Mon Sep 17 00:00:00 2001 From: haoxin Date: Mon, 11 Apr 2016 19:06:57 +0800 Subject: [PATCH 2/3] bump devDeps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f6994a5..25e7be9 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,9 @@ ], "dependencies": {}, "devDependencies": { - "ioredis": "1.9.0", + "ioredis": "^1.15.1", "mocha": "*", - "redis": "0.10.2", + "redis": "^2.6.0-1", "should": "*" }, "license": "MIT", From 0b0690fe78ea196851c68f5fb11d688571525477 Mon Sep 17 00:00:00 2001 From: haoxin Date: Mon, 11 Apr 2016 19:09:07 +0800 Subject: [PATCH 3/3] convert tab to space --- index.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/index.js b/index.js index 687c467..2b1c370 100644 --- a/index.js +++ b/index.js @@ -68,7 +68,7 @@ Limiter.prototype.get = function (fn) { function create() { var ex = (Date.now() + duration) / 1000 | 0; - db.multi() + db.multi() .set([count, max, 'PX', duration, 'NX']) .set([limit, max, 'PX', duration, 'NX']) .set([reset, ex, 'PX', duration, 'NX']) @@ -116,15 +116,15 @@ Limiter.prototype.get = function (fn) { } function mget() { - db.watch([count], function (err) { - if (err) return fn(err); - db.mget([count, limit, reset], function (err, res) { - if (err) return fn(err); - if (!res[0] && res[0] !== 0) return create(); - - decr(res); - }); - }); + db.watch([count], function (err) { + if (err) return fn(err); + db.mget([count, limit, reset], function (err, res) { + if (err) return fn(err); + if (!res[0] && res[0] !== 0) return create(); + + decr(res); + }); + }); } mget();