Merge branch 'master' into bengourley/retry

bugsnag · May 14, 2019 · cdfab2e · cdfab2e
2 parents 38dc011 + 3582823
commit cdfab2e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -337,7 +337,7 @@ function cleanupTempFiles (options) {
         fs.unlinkSync(options.sourceMap)
       }
       fs.rmdir(options.tempDir, (err) => {
-        if (err) {
+        if (err && err.code !== 'ENOTEMPTY') {
           reject(err)
         } else {
           resolve()

diff --git a/lib/request.js b/lib/request.js
@@ -7,7 +7,7 @@ const url = require('url')
 const once = require('once')
 const FormData = require('form-data')
 
-const MAX_ATTEMPTS = 20
+const MAX_ATTEMPTS = 5
 const RETRY_INTERVAL = parseInt(process.env.BUGSNAG_RETRY_INTERVAL) || 1000
 const TIMEOUT = parseInt(process.env.BUGSNAG_TIMEOUT) || 30000
 
@@ -18,7 +18,7 @@ module.exports = (endpoint, makePayload, onSuccess, onError) => {
     if (err && err.isRetryable !== false && attempts < MAX_ATTEMPTS) return setTimeout(go, RETRY_INTERVAL)
     return onError(err)
   }
-  const go = () => { console.log('try'); send(endpoint, makePayload(), onSuccess, maybeRetry) }
+  const go = () => send(endpoint, makePayload(), onSuccess, maybeRetry)
   go()
 }
 

diff --git a/test/index.test.js b/test/index.test.js
@@ -75,9 +75,9 @@ describe('validateOptions', () => {
 
 describe('prepareRequest', () => {
   test('removes options.overwrite when false', () => {
-    expect(prepareRequest({ overwrite: false }).formData).toEqual({})
+    expect(prepareRequest({ overwrite: false })).toEqual({})
   })
   test('does not remove options.overwrite when true', () => {
-    expect(prepareRequest({ overwrite: true }).formData).toEqual({ overwrite: 'true' })
+    expect(prepareRequest({ overwrite: true })).toEqual({ overwrite: 'true' })
   })
 })