From 930e7fa4089b4e0abb9ba0773ecef7d4240562bc Mon Sep 17 00:00:00 2001
From: Norwin Roosen <github@nroo.de>
Date: Wed, 20 Feb 2019 15:56:53 +0100
Subject: [PATCH] improve default log fields

---
 src/providers/logging/logging.ts | 14 ++++++++------
 tools/logserver.js               |  5 +----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/providers/logging/logging.ts b/src/providers/logging/logging.ts
index 60b828e..8ef40d1 100644
--- a/src/providers/logging/logging.ts
+++ b/src/providers/logging/logging.ts
@@ -30,11 +30,12 @@ export class LoggingProvider {
     private storage: StorageProvider,
     private translate: TranslateService,
   ) {
-    const { defaultFields } = this
-    defaultFields.appVersion = APP_VERSION
-    defaultFields.platform = this.plt.platforms().join(' ')
-    defaultFields.platformVersion = this.plt.version().str
-    defaultFields.lang = translate.currentLang
+    if (!this.defaultFields.appVersion) {
+      this.defaultFields.appVersion = APP_VERSION
+      this.defaultFields.platform = this.plt.platforms().join(' ')
+      this.defaultFields.platformVersion = this.plt.version().str
+      this.defaultFields.lang = translate.currentLang
+    }
   }
 
   createChild (component: string, defaultFields: object = {}) {
@@ -82,7 +83,8 @@ export class LoggingProvider {
       logentry.msg = msg
 
     Object.assign(logentry, this.defaultFields, {
-      time: Date.now(),
+      time: new Date().toISOString(),
+      levelText: LogLevel[level],
       level,
     })
 
diff --git a/tools/logserver.js b/tools/logserver.js
index f575276..7a4b556 100644
--- a/tools/logserver.js
+++ b/tools/logserver.js
@@ -21,10 +21,7 @@ const handleLog = (req, res) => {
   req.on('end', () => {
     try {
       const msg = JSON.parse(body)
-      msg.logclient = {
-        ip: req.connection.remoteAddress,
-        ua: req.headers['user-agent']
-      }
+      msg.useragent = req.headers['user-agent']
       fileStream.write(JSON.stringify(msg))
       fileStream.write('\n')