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

[Reporting] Update chromium exit behaviour (#113544) (#114464)

Browse source 
* move uncaught exception out of exit$

* reintroduce original error, but as a log instead

* change log level: error -> warning. also update copy to make it explicit that the error will be ignored

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Jean-Louis Leysens 2021-10-11 17:39:12 +02:00 committed by GitHub
parent 9eed9ee39b
commit db7794f536
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
x-pack/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
View file

@ -220,6 +220,17 @@ export class HeadlessChromiumDriverFactory {
})
);
const uncaughtExceptionPageError$ = Rx.fromEvent<Error>(page, 'pageerror').pipe(
map((err) => {
logger.warning(
i18n.translate('xpack.reporting.browsers.chromium.pageErrorDetected', {
defaultMessage: `Reporting encountered an uncaught error on the page that will be ignored: {err}`,
values: { err: err.toString() },
})
);
})
);
const pageRequestFailed$ = Rx.fromEvent<puppeteer.HTTPRequest>(page, 'requestfailed').pipe(
map((req) => {
const failure = req.failure && req.failure();
@ -231,7 +242,7 @@ export class HeadlessChromiumDriverFactory {
})
);
return Rx.merge(consoleMessages$, pageRequestFailed$);
return Rx.merge(consoleMessages$, uncaughtExceptionPageError$, pageRequestFailed$);
}
getProcessLogger(browser: puppeteer.Browser, logger: LevelLogger): Rx.Observable<void> {
@ -266,21 +277,10 @@ export class HeadlessChromiumDriverFactory {
})
);
const uncaughtExceptionPageError$ = Rx.fromEvent<Error>(page, 'pageerror').pipe(
mergeMap((err) => {
return Rx.throwError(
i18n.translate('xpack.reporting.browsers.chromium.pageErrorDetected', {
defaultMessage: `Reporting encountered an error on the page: {err}`,
values: { err: err.toString() },
})
);
})
);
const browserDisconnect$ = Rx.fromEvent(browser, 'disconnected').pipe(
mergeMap(() => Rx.throwError(getChromiumDisconnectedError()))
);
return Rx.merge(pageError$, uncaughtExceptionPageError$, browserDisconnect$);
return Rx.merge(pageError$, browserDisconnect$);
}
}