maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3303 from treydavis/format-stack-for-display

Browse source 
Ensure err.stack exists before calling indexOf
This commit is contained in:
Khalah Jones Golden 2015-03-18 08:12:29 -07:00
parent 9c98861291 04b0b9f7f3
commit 826879386c
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/kibana/components/notify/_notifier.js
View file

@ -87,6 +87,14 @@ define(function (require) {
return rtn;
}
// browsers format Error.stack differently; always include message
function formatStack(err) {
if (err.stack && !~err.stack.indexOf(err.message)) {
return 'Error: ' + err.message + '\n' + err.stack;
}
return err.stack;
}
/**
* Functionality to check that
*/
@ -187,7 +195,7 @@ define(function (require) {
var html = fatalToastTemplate({
msg: formatMsg(err, this.from),
stack: err.stack
stack: formatStack(err)
});
var $container = $('#fatal-splash-screen');
@ -217,7 +225,7 @@ define(function (require) {
title: 'Error',
lifetime: Infinity,
actions: ['report', 'accept'],
stack: err.stack.indexOf(err.message) > -1 ? err.stack : (err.message + err.stack)
stack: formatStack(err)
}, cb);
};