Skip to content

Commit

Permalink
make log init a bit nicer
Browse files Browse the repository at this point in the history
Signed-off-by: marton <marton.natko@adyen.com>
  • Loading branch information
marton committed Feb 25, 2025
1 parent bf95481 commit 1da80f4
Showing 1 changed file with 11 additions and 16 deletions.
27 changes: 11 additions & 16 deletions rexec/server/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand Down

0 comments on commit 1da80f4

Please sign in to comment.