diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-09-07 09:23:02 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-09-07 09:23:02 +0200 |
| commit | 45c784ed84b9d89846b5fcc804382b7d6f7810c9 (patch) | |
| tree | 4222e5e06fd58e1109bf7d79ab520ca8829cbfb0 | |
| parent | 0a543e82532fabcb59b40ef72143761d9c5ff48d (diff) | |
| parent | b8dc4f03029d46a1ee7889eabf283bac47b8dd14 (diff) | |
| download | mullvadvpn-45c784ed84b9d89846b5fcc804382b7d6f7810c9.tar.xz mullvadvpn-45c784ed84b9d89846b5fcc804382b7d6f7810c9.zip | |
Merge branch 'fix-logging-format'
| -rw-r--r-- | app/main.js | 3 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/app/main.js b/app/main.js index f812127172..3df1961886 100644 --- a/app/main.js +++ b/app/main.js @@ -42,6 +42,9 @@ const appDelegate = { }, _initLogging: () => { + const format = '[{y}-{m}-{d} {h}:{i}:{s}.{ms}][{level}] {text}'; + log.transports.console.format = format; + log.transports.file.format = format; if (isDevelopment) { log.transports.console.level = 'debug'; diff --git a/package.json b/package.json index 08cb13157f..5025d15731 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies": { "babel-runtime": "^6.22.0", "cheap-ruler": "^2.4.1", - "electron-log": "^2.2.0", + "electron-log": "^2.2.8", "electron-sudo": "https://github.com/eriklarko/electron-sudo.git", "history": "^4.6.1", "jsonrpc-lite": "^1.2.3", @@ -1967,9 +1967,9 @@ electron-download@^3.0.1: semver "^5.3.0" sumchecker "^1.2.0" -electron-log@^2.2.0: - version "2.2.6" - resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.6.tgz#ccfa3e09b39f321468c90a642701380a34079f1a" +electron-log@^2.2.8: + version "2.2.8" + resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.8.tgz#2296cccd8da046268a199c1a302dcb8cb16f2b72" electron-mocha@^3.3.0: version "3.4.0" |