apply better error handling

appbaseio · Jun 5, 2018 · cdb3173 · cdb3173
1 parent 8ac211a
commit cdb3173
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/lib/fetch_request.js b/lib/fetch_request.js
@@ -76,6 +76,11 @@ var fetchRequest = function () {
 		}
 
 		(0, _crossFetch2.default)(this.client.protocol + "://" + this.client.url + "/" + this.client.appname + "/" + this.path + "?" + _querystring2.default.stringify(this.params), requestOptions).then(function (res) {
+			if (res.status >= 500) {
+				_this.resultStream.emit("error", res);
+				return;
+			}
+
 			res.json().then(function (data) {
 				if (res.status >= 400) {
 					_this.resultStream.emit("error", res);

diff --git a/src/fetch_request.js b/src/fetch_request.js
@@ -55,6 +55,11 @@ export default class fetchRequest {
 
 		fetch(`${this.client.protocol}://${this.client.url}/${this.client.appname}/${this.path}?${querystring.stringify(this.params)}`, requestOptions)
 			.then(res => {
+				if (res.status >= 500) {
+					this.resultStream.emit("error", res);
+					return;
+				}
+
 				res.json().then(data => {
 					if (res.status >= 400) {
 						this.resultStream.emit("error", res);

diff --git a/test/msearch_test.js b/test/msearch_test.js
@@ -9,7 +9,7 @@ searchTests.searchForDocs = function searchForDocs(streamingClient, done) {
 	})
 		.on("error", function(e) {
 			console.log(e);
-			done();
+			done(e);
 		})
 		.on("data", function(res) {
 			// index second tweet
@@ -21,7 +21,7 @@ searchTests.searchForDocs = function searchForDocs(streamingClient, done) {
 			})
 				.on("error", function(e) {
 					console.log(e);
-					done();
+					done(e);
 				})
 				.on("data", function(res) {
 					var first = true;