Skip to content

Remove amz ids from error messages. #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
willwhite wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove amz ids from error messages. #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,10 @@ function managedError(err, context, grid) {
if (!error) return false;

if (error.statusCode >= 500 && err.amzRequestId) {
error.message = '[x-amz-request-id:' + err.amzRequestId + '] ' + error.message;
error.amzRequestId = err.amzRequestId;
}

if (error.statusCode >= 500 && err.amzId2) {
error.message = '[x-amz-id-2:' + err.amzId2 + '] ' + error.message;
error.amzId2 = err.amzId2;
}

Expand Down
10 changes: 5 additions & 5 deletions test/error.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ test('getTile retry internal error', function(assert) {
source.startWriting(function(err) {
if (err) return done(err);
source.getTile(3, 6, 5, function(err) {
assert.equal(err.message, '[x-amz-id-2:01234567] [x-amz-request-id:0000000000000000] unknown error', 'expected message');
assert.equal(err.message, 'unknown error', 'expected message');
assert.equal(err.statusCode, 500, 'expected statusCode');
assert.equal(attempts, 5, 'retried 4 times');
assert.end();
Expand Down Expand Up @@ -490,7 +490,7 @@ test('putTile retry on PUT internal error', function(assert) {
source.startWriting(function(err) {
if (err) return done(err);
source.putTile(3, 6, 5, png, function(err) {
assert.equal(err.message, '[x-amz-id-2:01234567] [x-amz-request-id:0000000000000000] unknown error', 'expected message');
assert.equal(err.message, 'unknown error', 'expected message');
assert.equal(err.statusCode, 500, 'expected statusCode');
assert.equal(attempts, 6, 'retried PUT 4 times');
assert.end();
Expand All @@ -516,7 +516,7 @@ test('putTile no retry on PUT http error (no body)', function(assert) {
source.startWriting(function(err) {
if (err) return done(err);
source.putTile(3, 6, 5, png, function(err) {
assert.equal(err.message, '[x-amz-id-2:01234567] [x-amz-request-id:0000000000000000] 503 Unknown');
assert.equal(err.message, '503 Unknown');
assert.equal(err.statusCode, 503, 'expected statusCode');
assert.equal(attempts, 6, 'retried PUT 4 times');
assert.end();
Expand All @@ -543,7 +543,7 @@ test('getTile error with no body', function(assert) {
source.startWriting(function(err) {
if (err) return done(err);
source.getTile(3, 6, 5, function(err) {
assert.equal(err.message, '[x-amz-id-2:01234567] [x-amz-request-id:0000000000000000] 503 Unknown', 'expected message');
assert.equal(err.message, '503 Unknown', 'expected message');
assert.equal(err.statusCode, 503, 'expected statusCode');
assert.equal(attempts, 5, 'retried 4 times');
assert.end();
Expand Down Expand Up @@ -571,7 +571,7 @@ test('getTile retry on content-length mismatch', function(assert) {
if (err) return done(err);
source.getTile(3, 6, 5, function(err) {
assert.equal(err.code, 'TruncatedResponseError', 'expected error code');
assert.equal(err.message, '[x-amz-id-2:01234567] [x-amz-request-id:0000000000000000] Content-Length does not match response body length', 'expected message');
assert.equal(err.message, 'Content-Length does not match response body length', 'expected message');
assert.equal(err.statusCode, 500, 'expected statusCode');
assert.equal(attempts, 5, 'retried 4 times');
assert.end();
Expand Down