Skip to content
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

fix: avoid calling fallback function twice (#198) #201

Merged
merged 1 commit into from
May 30, 2018
Merged

fix: avoid calling fallback function twice (#198) #201

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
10 changes: 6 additions & 4 deletions lib/circuit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,12 @@ class CircuitBreaker extends EventEmitter {
}
})
.catch(error => {
this.semaphore.release();
const latencyEndTime = Date.now() - latencyStartTime;
handleError(
error, this, timeout, args, latencyEndTime, resolve, reject);
if (!timeoutError) {
this.semaphore.release();
const latencyEndTime = Date.now() - latencyStartTime;
handleError(
error, this, timeout, args, latencyEndTime, resolve, reject);
}
});
} catch (error) {
this.semaphore.release();
Expand Down
19 changes: 19 additions & 0 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,24 @@ test('Passes error as last argument to the fallback function', t => {
breaker.fire(fails).catch(t.fail);
});

test('Fallback is not called twice for the same execution when action fails after timing out', t => {
t.plan(1);

const actionDuration = 200;
const breaker = circuit(timedFailingFunction, { timeout: actionDuration / 2 });

breaker.fallback((ms, err) => {
t.ok(err);
return Promise.reject(err);
});

breaker.fire(actionDuration)
.catch((err) => noop(err));

// keep this test alive until action finishes
setTimeout(() => noop, actionDuration);
});

test('Passes arguments to the fallback function', t => {
t.plan(1);
const fails = -1;
Expand Down Expand Up @@ -774,6 +792,7 @@ const identity = common.identity;
const passFail = common.passFail;
const slowFunction = common.slowFunction;
const timedFunction = common.timedFunction;
const timedFailingFunction = common.timedFailingFunction;
const nonPromise = common.nonPromise;
const callbackFunction = common.callbackFunction;
const failedCallbackFunction = common.failedCallbackFunction;