mirror of
https://github.com/bitwarden/browser
synced 2025-12-15 15:53:27 +00:00
Ps/improve-log-service (#8989)
* Match console method signatures in logService abstraction * Add a few usages of improved signature * Remove reality check test * Improve electron logging
This commit is contained in:
@@ -2,13 +2,18 @@ import { interceptConsole, restoreConsole } from "@bitwarden/common/spec";
|
||||
|
||||
import { ConsoleLogService } from "./console-log.service";
|
||||
|
||||
let caughtMessage: any = {};
|
||||
|
||||
describe("CLI Console log service", () => {
|
||||
const error = new Error("this is an error");
|
||||
const obj = { a: 1, b: 2 };
|
||||
let logService: ConsoleLogService;
|
||||
let consoleSpy: {
|
||||
log: jest.Mock<any, any>;
|
||||
warn: jest.Mock<any, any>;
|
||||
error: jest.Mock<any, any>;
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
caughtMessage = {};
|
||||
interceptConsole(caughtMessage);
|
||||
consoleSpy = interceptConsole();
|
||||
logService = new ConsoleLogService(true);
|
||||
});
|
||||
|
||||
@@ -19,24 +24,21 @@ describe("CLI Console log service", () => {
|
||||
it("should redirect all console to error if BW_RESPONSE env is true", () => {
|
||||
process.env.BW_RESPONSE = "true";
|
||||
|
||||
logService.debug("this is a debug message");
|
||||
expect(caughtMessage).toMatchObject({
|
||||
error: { 0: "this is a debug message" },
|
||||
});
|
||||
logService.debug("this is a debug message", error, obj);
|
||||
expect(consoleSpy.error).toHaveBeenCalledWith("this is a debug message", error, obj);
|
||||
});
|
||||
|
||||
it("should not redirect console to error if BW_RESPONSE != true", () => {
|
||||
process.env.BW_RESPONSE = "false";
|
||||
|
||||
logService.debug("debug");
|
||||
logService.info("info");
|
||||
logService.warning("warning");
|
||||
logService.error("error");
|
||||
logService.debug("debug", error, obj);
|
||||
logService.info("info", error, obj);
|
||||
logService.warning("warning", error, obj);
|
||||
logService.error("error", error, obj);
|
||||
|
||||
expect(caughtMessage).toMatchObject({
|
||||
log: { 0: "info" },
|
||||
warn: { 0: "warning" },
|
||||
error: { 0: "error" },
|
||||
});
|
||||
expect(consoleSpy.log).toHaveBeenCalledWith("debug", error, obj);
|
||||
expect(consoleSpy.log).toHaveBeenCalledWith("info", error, obj);
|
||||
expect(consoleSpy.warn).toHaveBeenCalledWith("warning", error, obj);
|
||||
expect(consoleSpy.error).toHaveBeenCalledWith("error", error, obj);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -6,17 +6,17 @@ export class ConsoleLogService extends BaseConsoleLogService {
|
||||
super(isDev, filter);
|
||||
}
|
||||
|
||||
write(level: LogLevelType, message: string) {
|
||||
write(level: LogLevelType, message?: any, ...optionalParams: any[]) {
|
||||
if (this.filter != null && this.filter(level)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (process.env.BW_RESPONSE === "true") {
|
||||
// eslint-disable-next-line
|
||||
console.error(message);
|
||||
console.error(message, ...optionalParams);
|
||||
return;
|
||||
}
|
||||
|
||||
super.write(level, message);
|
||||
super.write(level, message, ...optionalParams);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user