Merge pull request #15 from Ink/master

Fixes behavior on hangups and aborts
dannycoates · Dec 11, 2013 · a3e2f10 · a3e2f10
2 parents 9fa54d0 + cc79dfa
commit a3e2f10
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/request_set.js b/lib/request_set.js
@@ -18,10 +18,10 @@ function RequestSet(pool, options, callback) {
 	this.attemptsLeft = attemptsFu(options, pool)
 	this.attempts = this.attemptsLeft
 
-	this.maxHangups = options.maxHangups || 2
+	this.maxHangups = options.maxHangups || pool.options.maxRetries;
 	this.hangups = 0
 
-	this.maxAborts = options.maxAborts || 2
+	this.maxAborts = options.maxAborts || pool.options.maxRetries;
 	this.aborts = 0
 
 	if (!options.retryDelay && options.retryDelay !== 0) {
@@ -52,7 +52,7 @@ function handleResponse(err, response, body) {
 		if (err.reason === "socket hang up") { this.hangups++ }
 		else if (err.reason === "aborted") { this.aborts++ }
 
-		if (this.attemptsLeft > 0 && this.hangups < 2 && this.aborts < 2) {
+		if (this.attemptsLeft > 0 && this.hangups < this.maxHangups && this.aborts < this.maxAborts) {
 			this.pool.onRetry(err)
 			if (delay > 0) {
 				setTimeout(this.doRequest.bind(this), delay)

diff --git a/test/requestset_test.js b/test/requestset_test.js
@@ -108,14 +108,14 @@ describe("RequestSet", function () {
 			})
 		})
 
-		it("retries hangups once then fails", function (done) {
+		it("retries hangups identically to other requests then fails", function (done) {
 			var p = {
 				i: 0,
 				options: { maxRetries: 5 },
 				get_node: function () { return this.nodes[this.i++]},
 				onRetry: function () {},
 				length: 3,
-				nodes: [{ request: hangup_request }, { request: hangup_request }, { request: succeeding_request }]
+				nodes: [{ request: hangup_request }, { request: hangup_request }, { request: hangup_request }, { request: hangup_request }, { request: hangup_request }, { request: succeeding_request }]
 			}
 			RequestSet.request(p, {}, function (err, res, body) {
 				assert.equal(err.reason, "socket hang up")
@@ -139,14 +139,14 @@ describe("RequestSet", function () {
 			})
 		})
 
-		it("retries aborts once then fails", function (done) {
+		it("retries aborts identically to other requests then fails", function (done) {
 			var p = {
 				i: 0,
 				options: { maxRetries: 5 },
 				get_node: function () { return this.nodes[this.i++]},
 				onRetry: function () {},
 				length: 3,
-				nodes: [{ request: aborted_request }, { request: aborted_request }, { request: succeeding_request }]
+				nodes: [{ request: aborted_request }, { request: aborted_request }, { request: aborted_request }, { request: aborted_request}, { request: aborted_request}, { request: aborted_request} ]
 			}
 			RequestSet.request(p, {}, function (err, res, body) {
 				assert.equal(err.reason, "aborted")