github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5616 from spalger/backport/5611/4.2

Browse source 
Backport to 4.2: [Notifier] added better error descriptions
This commit is contained in:
Court Ewing 2015-12-09 14:09:38 -05:00
commit 6c44e56e08
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ui/public/courier/fetch/request/_error_handler.js
View file

@ -14,7 +14,7 @@ define(function (require) {
});
if (!myHandlers.length) {
notify.fatal(new Error('unhandled error ' + (error.stack || error.message)));
notify.fatal(new Error(`unhandled courier request error: ${ notify.describeError(error) }`));
} else {
myHandlers.forEach(function (handler) {
handler.defer.resolve(error);

11
src/ui/public/notify/notifier.js
View file

@ -86,12 +86,19 @@ define(function (require) {
if (typeof msg === 'string') {
rtn += msg;
} else if (msg instanceof Error) {
rtn += msg.message;
rtn += describeError(msg);
}
return rtn;
}
function describeError(err) {
if (!err) return undefined;
if (err.body && err.body.message) return err.body.message;
if (err.message) return err.message;
return '' + err;
}
function formatInfo() {
var info = [];
@ -281,6 +288,8 @@ define(function (require) {
}, cb);
};
Notifier.prototype.describeError = describeError;
if (log === _.noop) {
Notifier.prototype.log = _.noop;
} else {