From dd4c8ec5b4070481a8248904ee863228d549c979 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 May 2022 17:08:27 +0200
Subject: [PATCH 1/4] refactor: Use Logger Categories

---
 backend/log4js-config.json    | 39 ++++++++++++++++++++++++++++++++++-
 backend/src/server/plugins.ts |  8 +++----
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/backend/log4js-config.json b/backend/log4js-config.json
index 1c4b3fb6d..df9b428fe 100644
--- a/backend/log4js-config.json
+++ b/backend/log4js-config.json
@@ -13,6 +13,14 @@
     {
       "type": "dateFile",
       "filename": "../logs/backend/apollo.log",
+      "pattern": "%d{ISO8601} %p %c %m",
+      "keepFileExt" : true,
+      "fileNameSep" : "_" 
+    },
+    "backend": 
+    {
+      "type": "dateFile",
+      "filename": "../logs/backend/backend.log",
       "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m",
       "keepFileExt" : true,
       "fileNameSep" : "_" 
@@ -38,8 +46,16 @@
       {
         "type": "pattern", "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m"
       }
+    },
+    "apolloOut": 
+    {
+      "type": "stdout",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c %m"
+      }
 
-    }
+    }    
   },
   "categories": 
   {
@@ -48,7 +64,28 @@
       "appenders": 
       [
         "out",
+        "errors"
+      ],
+      "level": "debug",
+      "enableCallStack": true
+    },
+    "apollo":
+    {
+      "appenders": 
+      [
         "apollo",
+        "apolloOut",
+        "errors"
+      ],
+      "level": "debug",
+      "enableCallStack": true
+    },
+    "backend":
+    {
+      "appenders": 
+      [
+        "backend",
+        "out",
         "errors"
       ],
       "level": "debug",
diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts
index f3067d44a..e3e593b03 100644
--- a/backend/src/server/plugins.ts
+++ b/backend/src/server/plugins.ts
@@ -32,16 +32,16 @@ const logPlugin = {
   requestDidStart(requestContext: any) {
     const { logger } = requestContext
     const { query, mutation, variables } = requestContext.request
-    logger.trace(`Request:
+    logger.info(`Request:
 ${mutation || query}variables: ${JSON.stringify(filterVariables(variables), null, 2)}`)
     return {
       willSendResponse(requestContext: any) {
-        if (requestContext.context.user) logger.trace(`User ID: ${requestContext.context.user.id}`)
+        if (requestContext.context.user) logger.info(`User ID: ${requestContext.context.user.id}`)
         if (requestContext.response.data)
-          logger.trace(`Response-Data:
+          logger.info(`Response-Data:
 ${JSON.stringify(requestContext.response.data, null, 2)}`)
         if (requestContext.response.errors)
-          logger.trace(`Response-Errors:
+          logger.info(`Response-Errors:
 ${JSON.stringify(requestContext.response.errors, null, 2)}`)
         return requestContext
       },

From 3bccc01c26d20922888e3dc2188f605c64c1c5f2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 May 2022 17:14:48 +0200
Subject: [PATCH 2/4] fix ws

---
 backend/log4js-config.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend/log4js-config.json b/backend/log4js-config.json
index df9b428fe..451da56ab 100644
--- a/backend/log4js-config.json
+++ b/backend/log4js-config.json
@@ -39,7 +39,7 @@
       "level": "error",
       "appender": "errorFile"
     },
-    "out": 
+    "out":
     {
       "type": "stdout",
       "layout": 
@@ -54,10 +54,9 @@
       {
         "type": "pattern", "pattern": "%d{ISO8601} %p %c %m"
       }
-
     }    
   },
-  "categories": 
+  "categories":
   {
     "default": 
     {
@@ -71,7 +70,7 @@
     },
     "apollo":
     {
-      "appenders": 
+      "appenders":
       [
         "apollo",
         "apolloOut",
@@ -82,7 +81,7 @@
     },
     "backend":
     {
-      "appenders": 
+      "appenders":
       [
         "backend",
         "out",

From 8853e0d5f9aa0cd7123da05059da6414c3db0c68 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 May 2022 20:33:07 +0200
Subject: [PATCH 3/4] remove user context from apollo logger

---
 backend/src/server/logger.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/server/logger.ts b/backend/src/server/logger.ts
index 939d7eaba..27d0cf75b 100644
--- a/backend/src/server/logger.ts
+++ b/backend/src/server/logger.ts
@@ -12,7 +12,6 @@ log4js.configure(options)
 const apolloLogger = log4js.getLogger('apollo')
 const backendLogger = log4js.getLogger('backend')
 
-apolloLogger.addContext('user', 'unknown')
 backendLogger.addContext('user', 'unknown')
 
 export { apolloLogger, backendLogger }

From 28d876e71c95e978aeaab3dda47061314b560453 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 30 May 2022 07:51:13 +0200
Subject: [PATCH 4/4] log errors as error

---
 backend/src/server/plugins.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts
index e3e593b03..134ca1bb9 100644
--- a/backend/src/server/plugins.ts
+++ b/backend/src/server/plugins.ts
@@ -41,7 +41,7 @@ ${mutation || query}variables: ${JSON.stringify(filterVariables(variables), null
           logger.info(`Response-Data:
 ${JSON.stringify(requestContext.response.data, null, 2)}`)
         if (requestContext.response.errors)
-          logger.info(`Response-Errors:
+          logger.error(`Response-Errors:
 ${JSON.stringify(requestContext.response.errors, null, 2)}`)
         return requestContext
       },