Merge pull request #314 from TrekkieCoder/main

PR - More enhancements to debug logs
loxilb-io · Jun 13, 2023 · 00dc6c9 · 00dc6c9
2 parents 2acc108 + 3636f45
commit 00dc6c9
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 11 deletions.
diff --git a/loxilb-ebpf b/loxilb-ebpf
diff --git a/loxinet/dpebpf_linux.go b/loxinet/dpebpf_linux.go
@@ -192,8 +192,37 @@ func dpEbpfTicker() {
 	}
 }
 
+func DpEbpfDPLogLevel(cfg *C.struct_ebpfcfg, debug tk.LogLevelT) {
+	switch debug {
+	case tk.LogAlert:
+		cfg.loglevel = 5 // LOG_FATAL
+	case tk.LogCritical:
+		cfg.loglevel = 5 // LOG_FATAL
+	case tk.LogError:
+		cfg.loglevel = 4 // LOG_ERROR
+	case tk.LogWarning:
+		cfg.loglevel = 3 // LOG_WARNING
+	case tk.LogNotice:
+		cfg.loglevel = 3 // LOG_WARNING
+	case tk.LogInfo:
+		cfg.loglevel = 2 // LOG_INFO
+	case tk.LogDebug:
+		cfg.loglevel = 0 // LOG_TRACE
+	default:
+		cfg.loglevel = 1 // LOG_DEBUG
+	}
+}
+
+// DpEbpfSetLogLevel - Set log level for ebpf subsystem
+func DpEbpfSetLogLevel(logLevel tk.LogLevelT) {
+	cfg := C.struct_ebpfcfg{loglevel: 1}
+
+	DpEbpfDPLogLevel(&cfg, logLevel)
+	C.loxilb_set_loglevel(&cfg)
+}
+
 // DpEbpfInit - initialize the ebpf dp subsystem
-func DpEbpfInit(clusterEn bool, nodeNum int, debug bool) *DpEbpfH {
+func DpEbpfInit(clusterEn bool, nodeNum int, logLevel tk.LogLevelT) *DpEbpfH {
 	var cfg C.struct_ebpfcfg
 
 	if clusterEn {
@@ -204,9 +233,7 @@ func DpEbpfInit(clusterEn bool, nodeNum int, debug bool) *DpEbpfH {
 	cfg.nodenum = C.int(nodeNum)
 	cfg.loglevel = 1
 
-	if debug {
-		cfg.loglevel = 0
-	}
+	DpEbpfDPLogLevel(&cfg, logLevel)
 
 	C.loxilb_main(&cfg)
 

diff --git a/loxinet/loxinet.go b/loxinet/loxinet.go
@@ -86,6 +86,9 @@ func (mh *loxiNetH) ParamSet(param cmn.ParamMod) (int, error) {
 	if mh.logger != nil {
 		mh.logger.LogItSetLevel(logLevel)
 	}
+
+	DpEbpfSetLogLevel(logLevel)
+
 	return 0, nil
 }
 
@@ -157,12 +160,8 @@ func loxiNetInit() {
 	}
 
 	// Initialize logger and specify the log file
-	do_debug := false
 	logfile := fmt.Sprintf("%s%s.log", "/var/log/loxilb", os.Getenv("HOSTNAME"))
 	logLevel := LogString2Level(opts.Opts.LogLevel)
-	if logLevel == tk.LogDebug {
-		do_debug = true
-	}
 	mh.logger = tk.LogItInit(logfile, logLevel, true)
 
 	// Stack trace logger
@@ -202,7 +201,7 @@ func loxiNetInit() {
 	}
 
 	// Initialize the ebpf datapath subsystem
-	mh.dpEbpf = DpEbpfInit(clusterMode, mh.self, do_debug)
+	mh.dpEbpf = DpEbpfInit(clusterMode, mh.self, -1)
 	mh.dp = DpBrokerInit(mh.dpEbpf)
 
 	// Initialize the security zone subsystem

diff --git a/loxinet/utils.go b/loxinet/utils.go
@@ -112,7 +112,7 @@ func RunCommand(command string, isFatal bool) (int, error) {
 // LogString2Level - Convert log level in string to LogLevelT
 func LogString2Level(logStr string) tk.LogLevelT {
 	logLevel := tk.LogDebug
-	switch opts.Opts.LogLevel {
+	switch logStr {
 	case "info":
 		logLevel = tk.LogInfo
 	case "error":
+6 −0		common/log.c
+30 −12		kernel/loxilb_libdp.c
+1 −0		kernel/loxilb_libdp.h