From 47879d1bcc6f97c4c409ba6592f726329022aa81 Mon Sep 17 00:00:00 2001 From: Benjamin Eder Date: Sun, 12 Mar 2023 20:33:48 +0100 Subject: [PATCH] refactor: init audit logger when first used (#2369) --- audit/audit.go | 11 +++++------ audit/audit_test.go | 9 ++++++--- audit/log.go | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/audit/audit.go b/audit/audit.go index 3a04612a..e4ebdf4c 100644 --- a/audit/audit.go +++ b/audit/audit.go @@ -4,10 +4,9 @@ import "log" var auditLogger *log.Logger -func init() { - setupAuditLogger() -} - -func setupAuditLogger() { - auditLogger = log.Default() +func getAuditLogger() *log.Logger { + if auditLogger == nil { + auditLogger = log.Default() + } + return auditLogger } diff --git a/audit/audit_test.go b/audit/audit_test.go index 5bd9965c..d2cbb61a 100644 --- a/audit/audit_test.go +++ b/audit/audit_test.go @@ -8,9 +8,12 @@ import ( func TestSetupAuditLogger(t *testing.T) { auditLogger = nil - setupAuditLogger() + result := getAuditLogger() - if auditLogger != log.Default() { - t.Error("Audit logger isn't set to the default logger!") + if result != log.Default() { + t.Error("Audit logger wasn't initialized with the default logger!") + } + if auditLogger != result { + t.Error("Audit logger wasn't set globally!") } } diff --git a/audit/log.go b/audit/log.go index 816eca1b..fdc908fb 100644 --- a/audit/log.go +++ b/audit/log.go @@ -22,5 +22,5 @@ func createLogMessage(info ResourceActivity) string { } func logToAuditLogger(message string) { - auditLogger.Println(message) + getAuditLogger().Println(message) }