bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2026-01-01 16:13:19 +00:00
Code Issues Releases Wiki Activity

Revert "Use logService for console messages (#214)" (#219)

Browse Source 
This reverts commit 0fed528b6f.
This commit is contained in:
Matt Gibson
2020-12-04 13:58:32 -06:00
committed by GitHub
parent 0fed528b6f
commit 2b8c2c2b3e
10 changed files with 61 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/baseProgram.ts
View File

@@ -18,7 +18,7 @@ export abstract class BaseProgram {
if (!response.success) {
if (process.env.BW_QUIET !== 'true') {
if (process.env.BW_RESPONSE === 'true') {
this.writeLn(this.getJson(response), true, false);
this.writeLn(this.getJson(response), true, true);
} else {
this.writeLn(chalk.redBright(response.message), true, true);
}

50
src/cli/services/consoleLog.service.ts
View File

@@ -1,10 +1,27 @@
import { LogLevelType } from '../../enums/logLevelType';
import { ConsoleLogService as BaseConsoleLogService } from '../../services/consoleLog.service';
import { LogService as LogServiceAbstraction } from '../../abstractions/log.service';
export class ConsoleLogService extends BaseConsoleLogService {
constructor(isDev: boolean, filter: (level: LogLevelType) => boolean = null) {
super(isDev, filter);
export class ConsoleLogService implements LogServiceAbstraction {
constructor(private isDev: boolean, private filter: (level: LogLevelType) => boolean = null) { }
debug(message: string) {
if (!this.isDev) {
return;
}
this.write(LogLevelType.Debug, message);
}
info(message: string) {
this.write(LogLevelType.Info, message);
}
warning(message: string) {
this.write(LogLevelType.Warning, message);
}
error(message: string) {
this.write(LogLevelType.Error, message);
}
write(level: LogLevelType, message: string) {
@@ -12,12 +29,25 @@ export class ConsoleLogService extends BaseConsoleLogService {
return;
}
if (process.env.BW_RESPONSE) {
// tslint:disable-next-line
console.error(message);
return;
switch (level) {
case LogLevelType.Debug:
// tslint:disable-next-line
console.log(message);
break;
case LogLevelType.Info:
// tslint:disable-next-line
console.log(message);
break;
case LogLevelType.Warning:
// tslint:disable-next-line
console.warn(message);
break;
case LogLevelType.Error:
// tslint:disable-next-line
console.error(message);
break;
default:
break;
}
super.write(level, message);
}
}