kopia lustrzana https://github.com/c9/core
Merge pull request +10327 from c9/fix-raygun-errors
Fix raygun errorspull/223/head
commit
c8eaa6e031
|
@ -102,7 +102,7 @@
|
||||||
"c9.ide.recentfiles": "#7c099abf40",
|
"c9.ide.recentfiles": "#7c099abf40",
|
||||||
"c9.ide.remote": "#301d2ab519",
|
"c9.ide.remote": "#301d2ab519",
|
||||||
"c9.ide.processlist": "#2b12cd1bdd",
|
"c9.ide.processlist": "#2b12cd1bdd",
|
||||||
"c9.ide.run": "#f9b7d60b96",
|
"c9.ide.run": "#5390324c28",
|
||||||
"c9.ide.run.build": "#0598fff697",
|
"c9.ide.run.build": "#0598fff697",
|
||||||
"c9.ide.run.debug.xdebug": "#61dcbd0180",
|
"c9.ide.run.debug.xdebug": "#61dcbd0180",
|
||||||
"c9.ide.save": "#76cf52ab6d",
|
"c9.ide.save": "#76cf52ab6d",
|
||||||
|
|
|
@ -83,13 +83,12 @@ define(function(require, module, exports) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var timer;
|
var timer;
|
||||||
var timedout = false;
|
|
||||||
if (timeout) {
|
if (timeout) {
|
||||||
timer = setTimeout(function() {
|
timer = setTimeout(function() {
|
||||||
timedout = true;
|
|
||||||
xhr.abort();
|
xhr.abort();
|
||||||
var err = new Error("Timeout");
|
var err = new Error("Timeout");
|
||||||
err.code = "ETIMEOUT";
|
err.code = "ETIMEOUT";
|
||||||
|
err.data = {url: url, query: options.query};
|
||||||
done(err);
|
done(err);
|
||||||
}, timeout);
|
}, timeout);
|
||||||
}
|
}
|
||||||
|
|
|
@ -165,6 +165,7 @@ TraceKit.report = (function reportModuleWrapper() {
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (lastExceptionStack) {
|
if (lastExceptionStack) {
|
||||||
|
errorObj = lastException;
|
||||||
TraceKit.computeStackTrace.augmentStackTraceWithInitialElement(lastExceptionStack, url, lineNo, message);
|
TraceKit.computeStackTrace.augmentStackTraceWithInitialElement(lastExceptionStack, url, lineNo, message);
|
||||||
stack = lastExceptionStack;
|
stack = lastExceptionStack;
|
||||||
lastExceptionStack = null;
|
lastExceptionStack = null;
|
||||||
|
@ -187,7 +188,7 @@ TraceKit.report = (function reportModuleWrapper() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
notifyHandlers(stack, 'from window.onerror');
|
notifyHandlers(stack, 'from window.onerror', {errorObj: errorObj});
|
||||||
|
|
||||||
if (_oldOnerrorHandler) {
|
if (_oldOnerrorHandler) {
|
||||||
return _oldOnerrorHandler.apply(this, arguments);
|
return _oldOnerrorHandler.apply(this, arguments);
|
||||||
|
@ -201,7 +202,7 @@ TraceKit.report = (function reportModuleWrapper() {
|
||||||
* @param {Error} ex
|
* @param {Error} ex
|
||||||
*/
|
*/
|
||||||
function report(ex) {
|
function report(ex) {
|
||||||
var args = _slice.call(arguments, 1);
|
var args = _slice.call(arguments, 0);
|
||||||
if (lastExceptionStack) {
|
if (lastExceptionStack) {
|
||||||
if (lastException === ex) {
|
if (lastException === ex) {
|
||||||
return; // already caught by an inner catch block, ignore
|
return; // already caught by an inner catch block, ignore
|
||||||
|
@ -1423,6 +1424,7 @@ window.TraceKit = TraceKit;
|
||||||
'DealPly is not defined': { factor: 10e5 },
|
'DealPly is not defined': { factor: 10e5 },
|
||||||
"Cannot read property 'style' of null": { factor: 10e3 },
|
"Cannot read property 'style' of null": { factor: 10e3 },
|
||||||
"Project with id '<id>' does not exist": { factor: 10e2 },
|
"Project with id '<id>' does not exist": { factor: 10e2 },
|
||||||
|
"Workspace not found": { factor: 10e2 },
|
||||||
};
|
};
|
||||||
var groupedErrors = [{
|
var groupedErrors = [{
|
||||||
regex: /^((?:Project|User) with id ')(\d+)(' does not exist)/i,
|
regex: /^((?:Project|User) with id ')(\d+)(' does not exist)/i,
|
||||||
|
@ -1462,13 +1464,13 @@ window.TraceKit = TraceKit;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options === undefined) {
|
if (!options) {
|
||||||
options = {};
|
options = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isEmpty(options.customData)) {
|
if (isEmpty(options.customData)) {
|
||||||
if (typeof _customData === 'function') {
|
if (typeof _customData === 'function') {
|
||||||
options.customData = _customData();
|
options.customData = _customData(options.errorObj);
|
||||||
} else {
|
} else {
|
||||||
options.customData = _customData;
|
options.customData = _customData;
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue