Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-21 11:35:34 +01:00
Code Issues Projects Releases Wiki Activity

[PM-3754] Update electron log (#6680)

Browse Source
This commit is contained in:
Daniel García 2023-11-06 19:15:40 +01:00 committed by GitHub
parent aae9bdd586
commit ac1ab0bdcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/desktop/src/main.ts
View File

@ -76,6 +76,7 @@ export class Main {
} }
this.logService = new ElectronLogService(null, app.getPath("userData")); this.logService = new ElectronLogService(null, app.getPath("userData"));
this.logService.init();
this.i18nService = new I18nMainService("en", "./locales/"); this.i18nService = new I18nMainService("en", "./locales/");
const storageDefaults: any = {}; const storageDefaults: any = {};

14
apps/desktop/src/platform/services/electron-log.service.ts
View File

@ -8,16 +8,24 @@ import { ConsoleLogService as BaseLogService } from "@bitwarden/common/platform/
import { isDev } from "../../utils"; import { isDev } from "../../utils";
export class ElectronLogService extends BaseLogService { export class ElectronLogService extends BaseLogService {
constructor(protected filter: (level: LogLevelType) => boolean = null, logDir: string = null) { constructor(
protected filter: (level: LogLevelType) => boolean = null,
private logDir: string = null
) {
super(isDev(), filter); super(isDev(), filter);
}
// Initialize the log file transport. Only needs to be done once in the main process.
init() {
if (log.transports == null) { if (log.transports == null) {
return; return;
} }
log.transports.file.level = "info"; log.transports.file.level = "info";
if (logDir != null) { if (this.logDir != null) {
log.transports.file.file = path.join(logDir, "app.log"); log.transports.file.resolvePathFn = () => path.join(this.logDir, "app.log");
} }
log.initialize();
} }
write(level: LogLevelType, message: string) { write(level: LogLevelType, message: string) {

14
package-lock.json generated
View File

@ -125,7 +125,7 @@
"del": "6.1.1", "del": "6.1.1",
"electron": "25.9.1", "electron": "25.9.1",
"electron-builder": "23.6.0", "electron-builder": "23.6.0",
"electron-log": "4.4.8", "electron-log": "5.0.0",
"electron-reload": "2.0.0-alpha.1", "electron-reload": "2.0.0-alpha.1",
"electron-store": "8.1.0", "electron-store": "8.1.0",
"electron-updater": "5.3.0", "electron-updater": "5.3.0",
@ -20210,10 +20210,14 @@
} }
}, },
"node_modules/electron-log": { "node_modules/electron-log": {
"version": "4.4.8", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz", "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.0.tgz",
"integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA==", "integrity": "sha512-vB3akupmQvA8jAyNL9rULZtf6WoP8vsabjXsRtiqXS6/D37SwN/4LEyj4JD+9Bv6xoTcx/LrVnsIKEEWdq5ClQ==",
"dev": true "dev": true,
"engines": {
"electron": ">= 13",
"node": ">= 14"
}
}, },
"node_modules/electron-osx-sign": { "node_modules/electron-osx-sign": {
"version": "0.6.0", "version": "0.6.0",

2
package.json
View File

@ -89,7 +89,7 @@
"del": "6.1.1", "del": "6.1.1",
"electron": "25.9.1", "electron": "25.9.1",
"electron-builder": "23.6.0", "electron-builder": "23.6.0",
"electron-log": "4.4.8", "electron-log": "5.0.0",
"electron-reload": "2.0.0-alpha.1", "electron-reload": "2.0.0-alpha.1",
"electron-store": "8.1.0", "electron-store": "8.1.0",
"electron-updater": "5.3.0", "electron-updater": "5.3.0",