From c981fd3f82421881f44abbc7151a7f35be103dac Mon Sep 17 00:00:00 2001 From: Timothy Sullivan Date: Wed, 11 Sep 2019 15:51:57 -0700 Subject: [PATCH 1/3] remove isVerbose from logger object --- .../browsers/chromium/driver_factory/index.ts | 1 - .../plugins/reporting/server/lib/level_logger.ts | 14 ++++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts index 418b680254537..55d26be7971f2 100644 --- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts +++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts @@ -99,7 +99,6 @@ export class HeadlessChromiumDriverFactory { const chromiumArgs = args({ userDataDir, viewport, - verboseLogging: this.logger.isVerbose, disableSandbox: this.browserConfig.disableSandbox, proxyConfig: this.browserConfig.proxy, }); diff --git a/x-pack/legacy/plugins/reporting/server/lib/level_logger.ts b/x-pack/legacy/plugins/reporting/server/lib/level_logger.ts index 810ccf253943c..c67a9cd32d50d 100644 --- a/x-pack/legacy/plugins/reporting/server/lib/level_logger.ts +++ b/x-pack/legacy/plugins/reporting/server/lib/level_logger.ts @@ -13,19 +13,17 @@ const trimStr = (toTrim: string) => { export class LevelLogger { private _logger: any; private _tags: string[]; - private _isVerbose: boolean; public warn: (msg: string, tags?: string[]) => void; - static createForServer(server: any, tags: string[], isVerbose = false) { + static createForServer(server: any, tags: string[]) { const serverLog: ServerLog = (tgs: string[], msg: string) => server.log(tgs, msg); - return new LevelLogger(serverLog, tags, isVerbose); + return new LevelLogger(serverLog, tags); } - constructor(logger: ServerLog, tags: string[], isVerbose: boolean) { + constructor(logger: ServerLog, tags: string[]) { this._logger = logger; this._tags = tags; - this._isVerbose = isVerbose; /* * This shortcut provides maintenance convenience: Reporting code has been @@ -50,11 +48,7 @@ export class LevelLogger { this._logger([...this._tags, ...tags, 'info'], trimStr(msg)); } - public get isVerbose() { - return this._isVerbose; - } - public clone(tags: string[]) { - return new LevelLogger(this._logger, [...this._tags, ...tags], this._isVerbose); + return new LevelLogger(this._logger, [...this._tags, ...tags]); } } From 598aa21dea87647cc0a5580bfe68e9ea728814de Mon Sep 17 00:00:00 2001 From: Timothy Sullivan Date: Wed, 11 Sep 2019 15:52:43 -0700 Subject: [PATCH 2/3] Remove verboseLogging from chromium args --- .../browsers/chromium/driver_factory/args.ts | 16 ++++------------ .../browsers/chromium/driver_factory/index.ts | 1 - 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts index 3b66c1903a9a8..089fa2232be2e 100644 --- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts +++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts @@ -13,16 +13,9 @@ export interface IArgOptions { server: string; bypass?: string[]; }; - verboseLogging?: boolean; } -export const args = ({ - userDataDir, - viewport, - disableSandbox, - proxyConfig, - verboseLogging, -}: IArgOptions) => { +export const args = ({ userDataDir, viewport, disableSandbox, proxyConfig }: IArgOptions) => { const flags = [ // Disable built-in Google Translate service '--disable-translate', @@ -61,10 +54,9 @@ export const args = ({ flags.push('--no-sandbox'); } - if (verboseLogging) { - flags.push('--enable-logging'); - flags.push('--v=1'); - } + // log to chrome_debug.log + flags.push('--enable-logging'); + flags.push('--v=1'); if (process.platform === 'linux') { flags.push('--disable-setuid-sandbox'); diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts index 55d26be7971f2..96a6c84103bbf 100644 --- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts +++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts @@ -59,7 +59,6 @@ export class HeadlessChromiumDriverFactory { const chromiumArgs = args({ userDataDir, viewport, - verboseLogging: true, disableSandbox: this.browserConfig.disableSandbox, proxyConfig: this.browserConfig.proxy, }); From 8c8b7378bbeec7d937f199d1e8aec3b144b81f86 Mon Sep 17 00:00:00 2001 From: Timothy Sullivan Date: Mon, 23 Sep 2019 10:08:46 -0700 Subject: [PATCH 3/3] fix typescript --- .../server/browsers/chromium/driver_factory/args.ts | 9 +-------- x-pack/legacy/plugins/reporting/types.d.ts | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts index b914fe21f22f4..dc79a6b9db2c1 100644 --- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts +++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts @@ -11,16 +11,9 @@ interface LaunchArgs { viewport: BrowserConfig['viewport']; disableSandbox: BrowserConfig['disableSandbox']; proxy: BrowserConfig['proxy']; - verboseLogging: BrowserConfig['verboseLogging']; } -export const args = ({ - userDataDir, - viewport, - disableSandbox, - proxy: proxyConfig, - verboseLogging, -}: LaunchArgs) => { +export const args = ({ userDataDir, viewport, disableSandbox, proxy: proxyConfig }: LaunchArgs) => { const flags = [ // Disable built-in Google Translate service '--disable-translate', diff --git a/x-pack/legacy/plugins/reporting/types.d.ts b/x-pack/legacy/plugins/reporting/types.d.ts index f1ddab8689569..b777773d6aa5f 100644 --- a/x-pack/legacy/plugins/reporting/types.d.ts +++ b/x-pack/legacy/plugins/reporting/types.d.ts @@ -48,7 +48,6 @@ export interface BrowserConfig { server: string; bypass?: string[]; }; - verboseLogging?: boolean; } export interface ElementPosition {