From fdb62a636625310420cbbbd15656685f71d6df68 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 6 Sep 2024 13:25:01 +0900 Subject: [PATCH 1/2] logs: Added trace log level --- go.mod | 2 +- go.sum | 2 ++ loxilb-ebpf | 2 +- pkg/loxinet/dpebpf_linux.go | 3 ++- pkg/loxinet/loxinet.go | 2 ++ pkg/loxinet/utils.go | 3 +++ 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8dca8535e..3410e0d00 100644 --- 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 index 147be928d..116d9f01d 100644 --- 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 index 7a56a14a9..d35ce8223 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit 7a56a14a9aa26b05ed122e09ade2781ccfabc032 +Subproject commit d35ce822398731a7addc20a677f2caadcd689f18 diff --git a/pkg/loxinet/dpebpf_linux.go b/pkg/loxinet/dpebpf_linux.go index d9726d43a..2bb55e8a8 100644 --- 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 index d1dfb7cd5..9abac7ed0 100644 --- 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 index 0351092c8..a3f938621 100644 --- 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 } From 07ed44cbfc62625b3889c206062987edeba9edba Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 6 Sep 2024 16:17:46 +0900 Subject: [PATCH 2/2] logs: Reduced verbosity in default setting --- loxilb-ebpf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loxilb-ebpf b/loxilb-ebpf index d35ce8223..dc6cb12e8 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit d35ce822398731a7addc20a677f2caadcd689f18 +Subproject commit dc6cb12e876c873241558f1bbb9cf3e353965bc5