fix: ensure fallback event emits after function call

nodeshift · Dec 22, 2016 · df40ea7 · df40ea7
1 parent 38f4f8d
commit df40ea7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -73,7 +73,8 @@ Here is an example using [hapi.js](hapijs.com). See the
 [examples](https://github.com/bucharest-gold/opossum/tree/master/examples/)
 folder for more detail.
 
-```js index.js
+```js
+// server.js
 const server = new Hapi.Server();
 server.register(require('inert', (err) => possibleError(err)));
 server.route({
@@ -87,7 +88,7 @@ server.route({
 });
 ```
 
-```html index.html
+```html
 <html>
 <head>
   <title>My Super App</title>
@@ -101,7 +102,8 @@ server.route({
 </html>
 ```
 
-```js app.js
+```js
+// app.js
 const route = 'https://example-service.com/rest/route';
 const circuitBreakerOptions = {
   timeout: 500,

diff --git a/lib/circuit.js b/lib/circuit.js
@@ -234,12 +234,12 @@ function fail (circuit, err, args) {
 
   if (circuit[FALLBACK_FUNCTION]) {
     return new circuit.Promise((resolve, reject) => {
+      const result = circuit[FALLBACK_FUNCTION].apply(circuit[FALLBACK_FUNCTION], args);
       /**
        * Emitted when the breaker executes a fallback function
        * @event CircuitBreaker#fallback
        */
       circuit.emit('fallback', result);
-      const result = circuit[FALLBACK_FUNCTION].apply(circuit[FALLBACK_FUNCTION], args);
       resolve(result);
     });
   }