diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-03-30 11:55:45 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-04-03 16:12:03 +0200 |
| commit | cc3a57d280151a9a4fce36b66da599801f424240 (patch) | |
| tree | 42dfddeec16cd67a98ba78d986c6e24e9a6e4313 | |
| parent | c6c9a7bb21b4d465518987724c6b8fe33de9fa6a (diff) | |
| download | mullvadvpn-cc3a57d280151a9a4fce36b66da599801f424240.tar.xz mullvadvpn-cc3a57d280151a9a4fce36b66da599801f424240.zip | |
Update electron-log to 4.1.1
| -rw-r--r-- | gui/package-lock.json | 6 | ||||
| -rw-r--r-- | gui/package.json | 2 | ||||
| -rw-r--r-- | gui/src/shared/logging.ts | 2 | ||||
| -rw-r--r-- | gui/test/setup/renderer.ts | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/gui/package-lock.json b/gui/package-lock.json index 470376d445..b3c9021ff8 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -2873,9 +2873,9 @@ } }, "electron-log": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-3.0.7.tgz", - "integrity": "sha512-W5pjj9DtXjSHaJWH1VWSgBweJxeZ6OEBAIOzSbu6coKFYxXPGRyg9FAILYbnDt0iJT8r6YQqjEnYgmGJn/LoAg==" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.1.1.tgz", + "integrity": "sha512-vkK3rNBOciRiinxrsdgg8hyUia+ct8ZMjBblvKjgNk4uHEDjjSyn313NOwv75xOMVIKlfmYzxaN8kR/oGC33aQ==" }, "electron-mocha": { "version": "8.2.1", diff --git a/gui/package.json b/gui/package.json index 253d63658a..7d2ba8cf23 100644 --- a/gui/package.json +++ b/gui/package.json @@ -14,7 +14,7 @@ "dependencies": { "connected-react-router": "^5.0.1", "d3-geo-projection": "^2.7.0", - "electron-log": "^3.0.7", + "electron-log": "^4.1.1", "gettext-parser": "^4.0.1", "history": "^4.6.1", "jsonrpc-lite": "^2.0.7", diff --git a/gui/src/shared/logging.ts b/gui/src/shared/logging.ts index 4c0af38334..c33f22a0b7 100644 --- a/gui/src/shared/logging.ts +++ b/gui/src/shared/logging.ts @@ -42,7 +42,7 @@ export function setupLogging(logFile: string) { } else { // Configure logging to file log.transports.file.level = 'debug'; - log.transports.file.file = logFile; + log.transports.file.resolvePath = (_variables) => logFile; log.debug(`Logging to ${logFile}`); } diff --git a/gui/test/setup/renderer.ts b/gui/test/setup/renderer.ts index d3de21979d..b8e1c5e2a3 100644 --- a/gui/test/setup/renderer.ts +++ b/gui/test/setup/renderer.ts @@ -7,7 +7,6 @@ import chaiAsPromised from 'chai-as-promised'; log.transports.console.level = false; log.transports.file.level = false; -log.transports.mainConsole = null; chai.use(spies); chai.use(chaiAsPromised); |