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

[Reporting] Improve the page exit error messages (#59351)

Browse source 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
Tim Sullivan 2020-03-06 11:43:15 -07:00 committed by GitHub
parent 8fa9962641
commit fbbb3f8091
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,27 +3,28 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import { i18n } from '@kbn/i18n';
import del from 'del';
import fs from 'fs';
import os from 'os';
import path from 'path';
import {
Browser,
Page,
LaunchOptions,
ConsoleMessage,
LaunchOptions,
Page,
Request as PuppeteerRequest,
} from 'puppeteer';
import del from 'del';
import * as Rx from 'rxjs';
import { ignoreElements, map, mergeMap, tap } from 'rxjs/operators';
import { InnerSubscriber } from 'rxjs/internal/InnerSubscriber';
import { ignoreElements, map, mergeMap, tap } from 'rxjs/operators';
import { BrowserConfig, CaptureConfig } from '../../../../types';
import { LevelLogger as Logger } from '../../../lib/level_logger';
import { HeadlessChromiumDriver } from '../driver';
import { safeChildProcess } from '../../safe_child_process';
import { puppeteerLaunch } from '../puppeteer';
import { HeadlessChromiumDriver } from '../driver';
import { getChromeLogLocation } from '../paths';
import { puppeteerLaunch } from '../puppeteer';
import { args } from './args';
type binaryPath = string;
@ -216,17 +217,35 @@ export class HeadlessChromiumDriverFactory {
}
getPageExit(browser: Browser, page: Page) {
const pageError$ = Rx.fromEvent<Error>(page, 'error').pipe(mergeMap(err => Rx.throwError(err)));
const pageError$ = Rx.fromEvent<Error>(page, 'error').pipe(
mergeMap(err => {
return Rx.throwError(
i18n.translate('xpack.reporting.browsers.chromium.errorDetected', {
defaultMessage: 'Reporting detected an error: {err}',
values: { err: err.toString() },
})
);
})
);
const uncaughtExceptionPageError$ = Rx.fromEvent<Error>(page, 'pageerror').pipe(
mergeMap(err => Rx.throwError(err))
mergeMap(err => {
return Rx.throwError(
i18n.translate('xpack.reporting.browsers.chromium.pageErrorDetected', {
defaultMessage: `Reporting detected an error on the page: {err}`,
values: { err: err.toString() },
})
);
})
);
const browserDisconnect$ = Rx.fromEvent(browser, 'disconnected').pipe(
mergeMap(() =>
Rx.throwError(
new Error(
`Puppeteer was disconnected from the Chromium instance! Chromium has closed or crashed.`
i18n.translate('xpack.reporting.browsers.chromium.chromiumClosed', {
defaultMessage: `Reporting detected that Chromium has closed.`,
})
)
)
)