mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Add source location to top-level unhandled error if available

Browse source
This commit is contained in:
Jamie Kyle 2023-03-16 17:03:38 -07:00 committed by GitHub
parent e0bac61346
commit cdc743d834
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ts/logging/set_up_renderer_logging.ts
View file

@ -114,9 +114,40 @@ window.SignalContext.log = {
trace: log.trace,
};
window.onerror = (_message, _script, _line, _col, error) => {
function toLocation(
event: string | Event,
sourceArg?: string,
lineArg?: number,
columnArg?: number
) {
let source = sourceArg;
let line = lineArg;
let column = columnArg;
if (event instanceof ErrorEvent) {
source ??= event.filename;
line ??= event.lineno;
column ??= event.colno;
}
if (source == null) {
return '(@ unknown)';
}
if (line != null && column != null) {
return `(@ ${source}:${line}:${column})`;
}
if (line != null) {
return `(@ ${source}:${line})`;
}
return `(@ ${source})`;
}
window.onerror = (event, source, line, column, error) => {
const errorInfo = Errors.toLogFormat(error);
log.error(`Top-level unhandled error: ${errorInfo}`);
log.error(
`Top-level unhandled error: ${errorInfo}`,
toLocation(event, source, line, column)
);
};
window.addEventListener('unhandledrejection', rejectionEvent => {