Merge pull request #11 from Adyen/marton/logging

Marton/logging
Adyen · Feb 25, 2025 · 315ef98 · 315ef98
2 parents bf95481 + 2130634
commit 315ef98
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/rexec/server/config.go b/rexec/server/config.go
@@ -26,31 +26,26 @@ var ByPassedUsers []string
 var MaxStokesPerLine int
 
 func Init() {
-	var sysLogLevel zerolog.Level
-	sysLogLevel = zerolog.FatalLevel
-	if SysDebugLog {
-		sysLogLevel = zerolog.DebugLevel
-	}
-
-	var auditLogLevel zerolog.Level
-	auditLogLevel = zerolog.InfoLevel
+	auditLevel := zerolog.InfoLevel
 	if AuditFullTraceLog {
-		auditLogLevel = zerolog.TraceLevel
+		auditLevel = zerolog.TraceLevel
 	}
+	sysLevel := zerolog.PanicLevel
+	if SysDebugLog {
+		sysLevel = zerolog.DebugLevel
+	}
+	auditLogger = zerolog.New(os.Stdout).With().Timestamp().Str("facility", "audit").Logger().Level(auditLevel)
+	SysLogger = zerolog.New(os.Stdout).With().Timestamp().Str("facility", "sys").Logger().Level(sysLevel)
 
-	logger := zerolog.New(os.Stdout).With().Timestamp().Logger()
-
-	SysLogger = logger.With().Str("facility", "sys").Logger().Level(sysLogLevel)
-	auditLogger = logger.With().Str("facility", "audit").Logger().Level(auditLogLevel)
 	rawCaCert, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt")
 	if err != nil {
-		logger.Fatal().Err(err)
+		SysLogger.Fatal().Err(err)
 	}
 	CAPool = x509.NewCertPool()
 	CAPool.AppendCertsFromPEM(rawCaCert)
 	rawToken, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/token")
 	if err != nil {
-		logger.Fatal().Err(err)
+		SysLogger.Fatal().Err(err)
 	}
 	token = string(rawToken)
 	proxyMap = make(map[string]bool)
@@ -64,7 +59,7 @@ func Init() {
 	if SecretSauce != "" {
 		_, err = uuid.Parse(SecretSauce)
 		if err != nil {
-			logger.Fatal().Err(err)
+			SysLogger.Fatal().Err(err)
 		}
 	}
 	if MaxStokesPerLine == 0 {

diff --git a/rexec/server/tcp.go b/rexec/server/tcp.go
@@ -117,15 +117,15 @@ func (t *TCPLogger) Write(b []byte) (n int, err error) {
 			if frame.Opcode == 0x2 {
 				if auditLogger.GetLevel() == zerolog.TraceLevel {
 					stroke, err := hex.DecodeString(fmt.Sprintf("%x", frame.Payload))
-					SysLogger.Error().Err(err).Msg("failed to parse payload")
-
-					auditLogger.Trace().Str("user", userMap[t.ctxid]).Str("session", t.ctxid).Str("stroke", strings.ReplaceAll(string(stroke), "\u0000", "")).Msg("")
-					asyncAuditChan <- asyncAudit{
-						ctxid: t.ctxid,
-						ascii: frame.Payload,
+					if err != nil {
+						SysLogger.Error().Err(err).Msg("failed to parse payload")
 					}
+					auditLogger.Trace().Str("user", userMap[t.ctxid]).Str("session", t.ctxid).Str("stroke", strings.ReplaceAll(string(stroke), "\u0000", "")).Msg("")
+				}
+				asyncAuditChan <- asyncAudit{
+					ctxid: t.ctxid,
+					ascii: frame.Payload,
 				}
-
 			}
 		}
 	}