Skip to content

Commit

Permalink
Merge pull request #24 from cspanring/indexmode-error-message
Browse files Browse the repository at this point in the history
Throws activation error when no response body is present
  • Loading branch information
Kerry350 committed Dec 14, 2015
2 parents 24e12c6 + 05c7715 commit d25817a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/s3-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,8 @@ module.exports = CoreObject.extend({
this.client.putBucketWebsite(params, function(err, data) {
if (err) {
reject(err);
} else if (!data.Body) {
reject(new SilentError('No data received: please verify correct "indexMode" config.'));
} else {
resolve(data.Body);
}
Expand Down Expand Up @@ -407,7 +409,7 @@ module.exports = CoreObject.extend({

_getFormattedErrorMessage: function(message, error) {
message = message + '\n\n';
error = (error) ? (error.stack + '\n') : '';
error = (error) ? (error.stack || error.message + '\n') : '';
return message + error;
}
});

0 comments on commit d25817a

Please sign in to comment.