Merge pull request #1194 from s1061123/fix-logging

Fix to use lumberjack only for logging files

pkg/checkpoint/checkpoint_test.go

@@ -15,6 +15,8 @@
 
 package checkpoint
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"fmt"
 	"os"

pkg/cmdutils/cmdutils_suite_test.go

@@ -15,6 +15,8 @@
 // Package cmdutils is the package that contains utilities for multus command
 package cmdutils
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

pkg/cmdutils/utils_test.go

@@ -15,6 +15,8 @@
 // Package cmdutils is the package that contains utilities for multus command
 package cmdutils
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"fmt"
 	"os"

pkg/k8sclient/k8sclient_test.go

@@ -15,6 +15,8 @@
 
 package k8sclient
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"fmt"
 	"os"

pkg/kubeletclient/kubeletclient_test.go

@@ -15,6 +15,8 @@
 
 package kubeletclient
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"context"
 	"fmt"

pkg/logging/logging.go

@@ -56,6 +56,11 @@ type LogOptions struct {
 
 // SetLogOptions set the LoggingOptions of NetConf
 func SetLogOptions(options *LogOptions) {
+	// logger is used only if filname is supplied
+	if logger == nil || logger.Filename == "" {
+		return
+	}
+
 	// give some default value
 	updatedLogger := lumberjack.Logger{
 		Filename:   logger.Filename,
@@ -176,16 +181,24 @@ func SetLogStderr(enable bool) {
 
 // SetLogFile sets logging file
 func SetLogFile(filename string) {
+	// logger is used only if filname is supplied
 	if filename == "" {
 		return
 	}
+
 	updatedLogger := lumberjack.Logger{
 		Filename:   filename,
-		MaxAge:     logger.MaxAge,
+		MaxAge:     5,
-		MaxBackups: logger.MaxBackups,
+		MaxBackups: 5,
-		Compress:   logger.Compress,
+		Compress:   true,
-		MaxSize:    logger.MaxSize,
+		MaxSize:    100,
-		LocalTime:  logger.LocalTime,
+	}
+
+	if logger != nil {
+		updatedLogger.MaxAge = logger.MaxAge
+		updatedLogger.MaxBackups = logger.MaxBackups
+		updatedLogger.Compress = logger.Compress
+		updatedLogger.MaxSize = logger.MaxSize
 	}
 	logger = &updatedLogger
 	loggingW = logger
@@ -195,5 +208,5 @@ func init() {
 	loggingStderr = true
 	loggingW = nil
 	loggingLevel = PanicLevel
-	logger = &lumberjack.Logger{}
+	logger = nil
 }

pkg/logging/logging_test.go

@@ -15,6 +15,8 @@
 
 package logging
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"fmt"
 	"os"
@@ -106,13 +108,13 @@ var _ = Describe("logging operations", func() {
 		Verbosef("foobar")
 		Expect(Errorf("foobar")).NotTo(BeNil())
 		Panicf("foobar")
-		logger.Filename = ""
+		logger = nil
 		loggingW = nil
 		err = os.RemoveAll(tmpDir)
 		Expect(err).NotTo(HaveOccurred())
 		// Revert the log variable to init
 		loggingW = nil
-		logger = &lumberjack.Logger{}
+		logger = nil
 	})
 
 	// Tests public getter

pkg/multus/multus_cni020_test.go

@@ -14,6 +14,8 @@
 
 package multus
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"context"
 	"fmt"

pkg/multus/multus_cni040_test.go

@@ -14,6 +14,8 @@
 
 package multus
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"context"
 	"fmt"

pkg/multus/multus_cni100_test.go

@@ -14,6 +14,8 @@
 
 package multus
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"context"
 	"fmt"

pkg/multus/multus_suite_test.go

@@ -14,6 +14,8 @@
 
 package multus
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"bytes"
 	"context"

pkg/netutils/netutils_test.go

@@ -15,6 +15,8 @@
 
 package netutils
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"encoding/json"
 	"net"

pkg/server/exec_chroot_test.go

@@ -14,6 +14,8 @@
 
 package server
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"context"
 	"os"

pkg/server/server_suite_test.go

@@ -14,6 +14,8 @@
 
 package server
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

pkg/server/server_test.go

@@ -14,6 +14,8 @@
 
 package server
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

pkg/server/thick_cni_test.go

@@ -14,6 +14,8 @@
 
 package server
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"context"
 	"fmt"

pkg/types/conf_test.go

@@ -15,6 +15,8 @@
 
 package types
 
+// disable dot-imports only for testing
+//revive:disable:dot-imports
 import (
 	"encoding/json"
 	"fmt"