Skip to content

[Reporting] Ensure Chromium is always launched with args to create chrome_debug.log #45479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsullivan merged 6 commits into from
Sep 23, 2019
Merged

[Reporting] Ensure Chromium is always launched with args to create chrome_debug.log #45479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c981fd3
remove isVerbose from logger object
tsullivan Sep 11, 2019
598aa21
Remove verboseLogging from chromium args
tsullivan Sep 11, 2019
3cb2127
Merge branch 'master' into reporting/chromium-always-verbose
tsullivan Sep 19, 2019
0fe0585
Merge branch 'master' into reporting/chromium-always-verbose
tsullivan Sep 20, 2019
edba464
Merge branch 'master' into reporting/chromium-always-verbose
tsullivan Sep 23, 2019
8c8b737
fix typescript
tsullivan Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -59,11 +52,9 @@ export const args = ({
flags.push('--no-sandbox');
}

// TODO remove conditional
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');
Expand Down
2 changes: 0 additions & 2 deletions x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ export class HeadlessChromiumDriverFactory {
const chromiumArgs = args({
userDataDir,
viewport,
verboseLogging: true,
disableSandbox: this.browserConfig.disableSandbox,
proxy: this.browserConfig.proxy,
});
Expand Down Expand Up @@ -91,7 +90,6 @@ export class HeadlessChromiumDriverFactory {
const chromiumArgs = args({
userDataDir,
viewport,
verboseLogging: this.logger.isVerbose,
disableSandbox: this.browserConfig.disableSandbox,
proxy: this.browserConfig.proxy,
});
Expand Down
14 changes: 4 additions & 10 deletions x-pack/legacy/plugins/reporting/server/lib/level_logger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]);
}
}
1 change: 0 additions & 1 deletion x-pack/legacy/plugins/reporting/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export interface BrowserConfig {
server: string;
bypass?: string[];
};
verboseLogging?: boolean;
}

export interface ElementPosition {
Expand Down