Skip to content

Commit 889fcfa

Browse files
committed
Remove 'cause' pattern for errors.
Fixes googleapis#56.
1 parent 586322d commit 889fcfa

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

lib/api_callable.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,12 @@ function retryable(aFunc, retry, otherArgs) {
212212
}
213213
cancelFunc = null;
214214
if (retry.retryCodes.indexOf(err.code) < 0) {
215-
error = new Error('Exception occurred in retry method that was ' +
216-
'not classified as transient');
217-
error.cause = err;
218-
callback(error);
215+
err.note = 'Exception occurred in retry method that was ' +
216+
'not classified as transient';
217+
callback(err);
219218
} else {
220-
error = new Error('Retry total timeout exceeded with exception');
221-
error.cause = err;
219+
error = err;
220+
error.note = 'Retry total timeout exceeded with exception';
222221
var toSleep = Math.random() * delay;
223222
timeoutId = setTimeout(function() {
224223
now = new Date();

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "google-gax",
3-
"version": "0.8.0",
3+
"version": "0.8.1",
44
"description": "Google API Extensions",
55
"main": "index.js",
66
"files": [

test/api_callable.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,9 @@ describe('retryable', function() {
371371
var spy = sinon.spy(fail);
372372
var apiCall = createApiCall(spy, settings);
373373
apiCall(null, null, function(err, resp) {
374-
expect(err).to.be.ok;
375-
expect(err.cause).to.be.an('error');
376-
expect(err.cause.code).to.eq(FAKE_STATUS_CODE_1);
374+
expect(err).to.be.an('error');
375+
expect(err.code).to.eq(FAKE_STATUS_CODE_1);
376+
expect(err.note).to.be.ok;
377377
expect(spy.callCount).to.eq(1);
378378
done();
379379
});
@@ -382,9 +382,9 @@ describe('retryable', function() {
382382
it('aborts retries', function(done) {
383383
var apiCall = createApiCall(fail, settings);
384384
apiCall(null, null, function(err, resp) {
385-
expect(err).to.be.ok;
386385
expect(err).to.be.an('error');
387-
expect(err.cause.code).to.eq(FAKE_STATUS_CODE_1);
386+
expect(err.code).to.eq(FAKE_STATUS_CODE_1);
387+
expect(err.note).to.be.ok;
388388
done();
389389
});
390390
});
@@ -394,9 +394,9 @@ describe('retryable', function() {
394394
var spy = sinon.spy(fail);
395395
var apiCall = createApiCall(spy, settings);
396396
apiCall(null, null, function(err, resp) {
397-
expect(err).to.be.ok;
398-
expect(err.cause).to.be.an('error');
399-
expect(err.cause.code).to.eq(FAKE_STATUS_CODE_1);
397+
expect(err).to.be.an('error');
398+
expect(err.code).to.eq(FAKE_STATUS_CODE_1);
399+
expect(err.note).to.be.ok;
400400
expect(spy.callCount).to.eq(toAttempt);
401401
done();
402402
});
@@ -411,9 +411,9 @@ describe('retryable', function() {
411411
var spy = sinon.spy(func);
412412
var apiCall = createApiCall(spy, settings);
413413
apiCall(null, null, function(err, resp) {
414-
expect(err).to.be.ok;
415-
expect(err.cause).to.be.an('error');
416-
expect(err.cause.code).to.eq(FAKE_STATUS_CODE_2);
414+
expect(err).to.be.an('error');
415+
expect(err.code).to.eq(FAKE_STATUS_CODE_2);
416+
expect(err.note).to.be.ok;
417417
expect(spy.callCount).to.eq(1);
418418
done();
419419
});
@@ -441,9 +441,9 @@ describe('retryable', function() {
441441
spy, new gax.CallSettings({timeout: 0, retry: retryOptions}));
442442

443443
apiCall(null, null, function(err, resp) {
444-
expect(err).to.be.ok;
445-
expect(err.cause).to.be.an('error');
446-
expect(err.cause.code).to.eq(FAKE_STATUS_CODE_1);
444+
expect(err).to.be.an('error');
445+
expect(err.code).to.eq(FAKE_STATUS_CODE_1);
446+
expect(err.note).to.be.ok;
447447
var now = new Date();
448448
expect(now.getTime() - startTime.getTime()).to.be.at.least(
449449
backoff.totalTimeoutMillis);

0 commit comments

Comments
 (0)