Skip to content

Commit

Permalink
Add bucket name to errors
Browse files Browse the repository at this point in the history
  • Loading branch information
almet committed Apr 16, 2015
1 parent 20be973 commit b00ddce
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions loop/filestorage/aws.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ AwsDriver.prototype = {
Key: filename,
ContentType: CONTENT_TYPE
}, function(err) {
if (err) return callback(err);
if (err) {
err.message = err.message + "(bucket name: " + self._publicBucket + ")";
return callback(err);
}
if (self.statsdClient !== undefined) {
self.statsdClient.timing(
'loop.aws.write',
Expand All @@ -67,11 +70,14 @@ AwsDriver.prototype = {
var self = this;
var startTime = Date.now();
s3.getObject({
Bucket: this._publicBucket,
Bucket: self._publicBucket,
Key: filename
}, function(err, data) {
if (err) {
if (err.code !== "NoSuchKey") return callback(err);
if (err.code !== "NoSuchKey") {
err.message = err.message + "(bucket name: " + self._publicBucket + ")";
return callback(err);
}
return callback(null, null);
}
var body = data.Body.toString();
Expand Down Expand Up @@ -100,7 +106,10 @@ AwsDriver.prototype = {
Bucket: this._publicBucket,
Key: filename
}, function(err) {
if (err && err.code !== "NoSuchKey") return callback(err);
if (err && err.code !== "NoSuchKey") {
err.message = err.message + "(bucket name: " + self._publicBucket + ")";
return callback(err);
}
if (self.statsdClient !== undefined) {
self.statsdClient.timing(
'loop.aws.remove',
Expand Down

0 comments on commit b00ddce

Please sign in to comment.