Merge branch 'main' into main

loxilb-io · Sep 6, 2024 · 3b62d1c · 3b62d1c
2 parents b9ad089 + 99367a3
commit 3b62d1c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/go-openapi/validate v0.22.0
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/loxilb-io/ipvs v0.1.0
-	github.com/loxilb-io/loxilib v0.8.9-0.20240826081440-53bcf7b9aed2
+	github.com/loxilb-io/loxilib v0.8.9-0.20240906040045-9ad9b8b549d3
 	github.com/osrg/gobgp/v3 v3.5.0
 	github.com/prometheus-community/pro-bing v0.1.0
 	github.com/prometheus/client_model v0.3.0

diff --git a/go.sum b/go.sum
@@ -300,6 +300,8 @@ github.com/loxilb-io/loxilib v0.8.9-0.20240826070926-6929c7b669f1 h1:6nwOmOypZLq
 github.com/loxilb-io/loxilib v0.8.9-0.20240826070926-6929c7b669f1/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg=
 github.com/loxilb-io/loxilib v0.8.9-0.20240826081440-53bcf7b9aed2 h1:id1unRAYmtM3asSpsE50LZJy7Z6cHjl8gNB4vZHMoQU=
 github.com/loxilb-io/loxilib v0.8.9-0.20240826081440-53bcf7b9aed2/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg=
+github.com/loxilb-io/loxilib v0.8.9-0.20240906040045-9ad9b8b549d3 h1:wM/yKX43GxROxnU9Qop8QMYFjlDOIALRgi9i7CxsM0s=
+github.com/loxilb-io/loxilib v0.8.9-0.20240906040045-9ad9b8b549d3/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg=
 github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4 h1:oDc2lsbfuQEcVP3k+Pw4v6Xdm3t4M9vBc1Y9egszv6g=
 github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4/go.mod h1:1a6hv8ISVQhnW5IVpW9o+OL6BAFlWiVpC0O4d19g+wQ=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=

diff --git a/loxilb-ebpf b/loxilb-ebpf
diff --git a/pkg/loxinet/dpebpf_linux.go b/pkg/loxinet/dpebpf_linux.go
@@ -251,8 +251,9 @@ func DpEbpfDPLogLevel(cfg *C.struct_ebpfcfg, debug tk.LogLevelT) {
 		cfg.loglevel = 3 // LOG_WARNING
 	case tk.LogInfo:
 		cfg.loglevel = 2 // LOG_INFO
-	case tk.LogDebug:
+	case tk.LogTrace:
 		cfg.loglevel = 0 // LOG_TRACE
+	case tk.LogDebug:
 	default:
 		cfg.loglevel = 1 // LOG_DEBUG
 	}

diff --git a/pkg/loxinet/loxinet.go b/pkg/loxinet/loxinet.go
@@ -108,6 +108,8 @@ func (mh *loxiNetH) ParamSet(param cmn.ParamMod) (int, error) {
 func (mh *loxiNetH) ParamGet(param *cmn.ParamMod) (int, error) {
 	logLevel := "n/a"
 	switch mh.logger.CurrLogLevel {
+	case tk.LogTrace:
+		logLevel = "trace"
 	case tk.LogDebug:
 		logLevel = "debug"
 	case tk.LogInfo:

diff --git a/pkg/loxinet/utils.go b/pkg/loxinet/utils.go
@@ -75,6 +75,9 @@ func LogString2Level(logStr string) tk.LogLevelT {
 		logLevel = tk.LogCritical
 	case "emergency":
 		logLevel = tk.LogEmerg
+	case "trace":
+		logLevel = tk.LogTrace
+	case "debug":
 	default:
 		logLevel = tk.LogDebug
 	}