Merge branch 'master' into 2224-feature-concept-extend-contributionlink-rules-and-logic-abraham

backend/log4js-config.json

@@ -5,41 +5,66 @@
     {
       "type": "dateFile",
       "filename": "../logs/backend/access.log",
-      "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m",
+      "pattern": "yyyy-MM-dd",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
+      },
       "keepFileExt" : true,
-      "fileNameSep" : "_" 
+      "fileNameSep" : "_",
+      "numBackups" : 30
     },
     "apollo": 
     {
       "type": "dateFile",
       "filename": "../logs/backend/apollo.log",
-      "pattern": "%d{ISO8601} %p %c %m",
+      "pattern": "yyyy-MM-dd",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
+      },
       "keepFileExt" : true,
-      "fileNameSep" : "_" 
+      "fileNameSep" : "_",
+      "numBackups" : 30
     },
     "backend": 
     {
       "type": "dateFile",
       "filename": "../logs/backend/backend.log",
-      "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m",
+      "pattern": "yyyy-MM-dd",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
+      },
       "keepFileExt" : true,
-      "fileNameSep" : "_" 
+      "fileNameSep" : "_",
+      "numBackups" : 30
     },
     "klicktipp": 
     {
       "type": "dateFile",
       "filename": "../logs/backend/klicktipp.log",
-      "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m",
+      "pattern": "yyyy-MM-dd",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
+      },
       "keepFileExt" : true,
-      "fileNameSep" : "_" 
+      "fileNameSep" : "_",
+      "numBackups" : 30
     },
     "errorFile": 
     {
       "type": "dateFile",
       "filename": "../logs/backend/errors.log",
-      "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m",
+      "pattern": "yyyy-MM-dd",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
+      },
       "keepFileExt" : true,
-      "fileNameSep" : "_" 
+      "fileNameSep" : "_",
+      "numBackups" : 30
     },
     "errors": 
     {
@@ -52,7 +77,7 @@
       "type": "stdout",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       }
     },
     "apolloOut": 
@@ -60,7 +85,7 @@
       "type": "stdout",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       }
     }    
   },

backend/src/graphql/resolver/UserResolver.ts

@@ -351,7 +351,7 @@ export class UserResolver {
     }
     // add pubKey in logger-context for layout-pattern X{user} to print it in each logging message
     logger.addContext('user', dbUser.id)
-    logger.debug('login credentials valid...')
+    logger.debug('validation of login credentials successful...')
 
     const user = new User(dbUser, await getUserCreation(dbUser.id))
     logger.debug(`user= ${JSON.stringify(user, null, 2)}`)
@@ -396,6 +396,7 @@ export class UserResolver {
     @Args()
     { email, firstName, lastName, language, publisherId, redeemCode = null }: CreateUserArgs,
   ): Promise<User> {
+    logger.addContext('user', 'unknown')
     logger.info(
       `createUser(email=${email}, firstName=${firstName}, lastName=${lastName}, language=${language}, publisherId=${publisherId}, redeemCode =${redeemCode})`,
     )
@@ -548,6 +549,7 @@ export class UserResolver {
       }
 
       await queryRunner.commitTransaction()
+      logger.addContext('user', dbUser.id)
     } catch (e) {
       logger.error(`error during create user with ${e}`)
       await queryRunner.rollbackTransaction()
@@ -571,6 +573,7 @@ export class UserResolver {
   @Authorized([RIGHTS.SEND_RESET_PASSWORD_EMAIL])
   @Mutation(() => Boolean)
   async forgotPassword(@Arg('email') email: string): Promise<boolean> {
+    logger.addContext('user', 'unknown')
     logger.info(`forgotPassword(${email})...`)
     email = email.trim().toLowerCase()
     const user = await findUserByEmail(email).catch(() => {

backend/src/server/createServer.ts

@@ -35,6 +35,7 @@ const createServer = async (
   context: any = serverContext,
   logger: Logger = apolloLogger,
 ): Promise<ServerDef> => {
+  logger.addContext('user', 'unknown')
   logger.debug('createServer...')
 
   // open mysql connection