Fix expiration not starting at execution

SGrondin · May 3, 2018 · 4cfee33 · 4cfee33
1 parent dd8e103
commit 4cfee33
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/bottleneck.js b/bottleneck.js
@@ -251,7 +251,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           }, wait),
           expiration: next.options.expiration != null ? setTimeout(() => {
             return completed(new Bottleneck.prototype.BottleneckError(`This job timed out after ${next.options.expiration} ms.`));
-          }, next.options.expiration) : void 0,
+          }, wait + next.options.expiration) : void 0,
           job: next
         };
       }

diff --git a/bottleneck.min.js b/bottleneck.min.js
diff --git a/lib/Bottleneck.js b/lib/Bottleneck.js
@@ -250,7 +250,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           }, wait),
           expiration: next.options.expiration != null ? setTimeout(() => {
             return completed(new Bottleneck.prototype.BottleneckError(`This job timed out after ${next.options.expiration} ms.`));
-          }, next.options.expiration) : void 0,
+          }, wait + next.options.expiration) : void 0,
           job: next
         };
       }

diff --git a/src/Bottleneck.coffee b/src/Bottleneck.coffee
@@ -97,7 +97,7 @@ class Bottleneck
       , wait
       expiration: if next.options.expiration? then setTimeout =>
         completed new Bottleneck::BottleneckError "This job timed out after #{next.options.expiration} ms."
-      , next.options.expiration
+      , wait + next.options.expiration
       job: next
   _drainOne: (freed) =>
     @_registerLock.schedule =>