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

[Reporting/Screenshots] Do not fail the report if request is aborted (#52344)

Browse source 
* [Reporting/Screenshots] Do not fail the report if request is aborted

* take pageRequestFailed out of pageExit observable
This commit is contained in:
Tim Sullivan 2019-12-10 09:24:13 -07:00 committed by GitHub
parent 8115e500ff
commit e71deb2683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ import {
} from 'puppeteer';
import del from 'del';
import * as Rx from 'rxjs';
import { ignoreElements, mergeMap, tap } from 'rxjs/operators';
import { ignoreElements, map, mergeMap, tap } from 'rxjs/operators';
import { InnerSubscriber } from 'rxjs/internal/InnerSubscriber';
import { BrowserConfig, NetworkPolicy } from '../../../../types';
@ -144,7 +144,7 @@ export class HeadlessChromiumDriverFactory {
terminate$
.pipe(
tap(signal => {
this.logger.debug(`Observer got signal: ${signal}`);
this.logger.debug(`Termination signal received: ${signal}`);
}),
ignoreElements()
)
@ -156,7 +156,6 @@ export class HeadlessChromiumDriverFactory {
this.getProcessLogger(browser).subscribe();
const driver$ = Rx.of(new HeadlessChromiumDriver(page, { inspect: this.browserConfig.inspect, networkPolicy: this.networkPolicy })); // prettier-ignore
const exit$ = this.getPageExit(browser, page);
observer.next({ driver$, exit$ });
@ -173,9 +172,9 @@ export class HeadlessChromiumDriverFactory {
});
}
getBrowserLogger(page: Page): Rx.Observable<ConsoleMessage> {
return Rx.fromEvent<ConsoleMessage>(page, 'console').pipe(
tap(line => {
getBrowserLogger(page: Page): Rx.Observable<void> {
const consoleMessages$ = Rx.fromEvent<ConsoleMessage>(page, 'console').pipe(
map(line => {
if (line.type() === 'error') {
this.logger.error(line.text(), ['headless-browser-console']);
} else {
@ -183,6 +182,19 @@ export class HeadlessChromiumDriverFactory {
}
})
);
const pageRequestFailed$ = Rx.fromEvent<PuppeteerRequest>(page, 'requestfailed').pipe(
map(req => {
const failure = req.failure && req.failure();
if (failure) {
this.logger.warning(
`Request to [${req.url()}] failed! [${failure.errorText}]. This error will be ignored.`
);
}
})
);
return Rx.merge(consoleMessages$, pageRequestFailed$);
}
getProcessLogger(browser: Browser) {
@ -208,18 +220,6 @@ export class HeadlessChromiumDriverFactory {
mergeMap(err => Rx.throwError(err))
);
const pageRequestFailed$ = Rx.fromEvent<PuppeteerRequest>(page, 'requestfailed').pipe(
mergeMap(req => {
const failure = req.failure && req.failure();
if (failure) {
return Rx.throwError(
new Error(`Request to [${req.url()}] failed! [${failure.errorText}]`)
);
}
return Rx.throwError(new Error(`Unknown failure!`));
})
);
const browserDisconnect$ = Rx.fromEvent(browser, 'disconnected').pipe(
mergeMap(() =>
Rx.throwError(
@ -230,11 +230,6 @@ export class HeadlessChromiumDriverFactory {
)
);
return Rx.merge(
pageError$,
uncaughtExceptionPageError$,
pageRequestFailed$,
browserDisconnect$
);
return Rx.merge(pageError$, uncaughtExceptionPageError$, browserDisconnect$);
}
}