Merge pull request nearform#20 from thekemkid/reconnect

Reconnect counting added

Author: GlenTiki

anger.js

@@ -43,6 +43,8 @@ function anger (opts) {
   const again = tryAgain(xtend(defaultAgainOpts, opts.retryOpts))
 
   let timedOutResponses = 0
+  let disconnects = 0
+  let reconnects = -clients.length // will be 0 after connecting each client
 
   for (let i = 0; i < clients.length; i++) {
     clients[i] = new Client(opts.url)
@@ -51,6 +53,8 @@ function anger (opts) {
       sender: false
     }
     retries[i] = 0
+    clients[i].onDisconnect = () => { disconnects++ }
+    clients[i].onConnect = () => { reconnects++ }
     if (i < opts.senders) {
       senders[i] = clients[i]
       clients[i].anger.sender = true
@@ -70,7 +74,10 @@ function anger (opts) {
       if (err) {
         numRetries++
       } else {
-        connectLatencies.record(process.hrtime(startTime))
+        const end = process.hrtime(startTime)
+        const responseTime = end[0] * 1e3 + end[1] / 1e6
+
+        connectLatencies.record(responseTime)
         retries[client.anger.id] = numRetries
         done()
       }
@@ -178,7 +185,9 @@ function anger (opts) {
       connectLatencies: histUtil.addPercentiles(connectLatencies, histUtil.histAsObj(connectLatencies)),
       retriesAvg: mean(retries),
       connections: clients.length,
-      senders: opts.senders
+      senders: opts.senders,
+      disconnects: disconnects,
+      reconnects: reconnects
     })
   }
 

test/backoff.test.js

@@ -0,0 +1,55 @@
+'use strict'
+
+const test = require('tap').test
+const anger = require('..')
+
+test('backoff test', { timeout: 3000 }, (t) => {
+  t.plan(4)
+
+  const startTime = process.hrtime()
+
+  require('./authServer')((err, server) => {
+    t.error(err)
+
+    t.tearDown(server.stop.bind(server))
+
+    let uid = 0
+    const instance = anger({
+      url: server.info.uri,
+      subscription: '/greet',
+      senders: 1,
+      connections: 1,
+      requests: 1,
+      responses: 1,
+      identifier: (payload) => payload.meta.id,
+      auth: { headers: { authorization: `Basic ${new Buffer('jane:jane').toString('base64')}` } },
+      trigger: (sender) => {
+        sender.request({
+          method: 'POST',
+          path: '/h',
+          payload: {
+            id: ++uid
+          }
+        })
+        return uid
+      },
+      retryOpts: {
+        retries: 3,
+        min: 750,
+        max: 750
+      }
+    })
+
+    instance.on('error', (err) => {
+      t.ok(err, 'error happened')
+      const end = process.hrtime(startTime)
+      const elapsedTime = end[0] * 1e3 + end[1] / 1e6
+      t.ok(elapsedTime >= 1500, 'should have taken at least a second and a half to fail')
+      t.equal(server.failedCount, 3)
+    })
+
+    instance.on('end', () => {
+      t.fail('end never happens')
+    })
+  })
+})

test/basic.test.js

@@ -66,5 +66,8 @@ require('./server')((err, server) => {
     t.ok(result.connectLatencies.p999 >= 0, 'connectLatencies.p999 exists')
     t.ok(result.connectLatencies.p9999 >= 0, 'connectLatencies.p9999 exists')
     t.ok(result.connectLatencies.p99999 >= 0, 'connectLatencies.p99999 exists')
+
+    t.ok(result.disconnects >= 0, 'disconnects exist')
+    t.ok(result.reconnects >= 0, 'reconnects exists')
   })
 })