Merge branch 'loxilb-io:main' into main

loxilb-io · Oct 21, 2023 · 0d7da32 · 0d7da32
2 parents 1666fde + 147ac7b
commit 0d7da32
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/api/loxinlp/nlp.go b/api/loxinlp/nlp.go
@@ -996,7 +996,7 @@ func AddNeigh(neigh nlp.Neigh, link nlp.Link) int {
 				brId = vxlan.VxlanId
 				ftype = cmn.FdbTun
 			} else {
-				tk.LogIt(tk.LogError, "[NLP] L2fdb %v brId %v dst %v dev %v IGNORED\n", mac[:], brId, dst, name)
+				tk.LogIt(tk.LogInfo, "[NLP] L2fdb %v brId %v dst %v dev %v IGNORED\n", mac[:], brId, dst, name)
 				return 0
 			}
 		} else {
@@ -1037,7 +1037,7 @@ func DelNeigh(neigh nlp.Neigh, link nlp.Link) int {
 			tk.LogIt(tk.LogError, "[NLP] NH  %v %v del failed\n", neigh.IP.String(), name)
 			ret = -1
 		} else {
-			tk.LogIt(tk.LogError, "[NLP] NH %v %v deleted\n", neigh.IP.String(), name)
+			tk.LogIt(tk.LogInfo, "[NLP] NH %v %v deleted\n", neigh.IP.String(), name)
 		}
 
 	} else {
@@ -1121,10 +1121,10 @@ func AddRoute(route nlp.Route) int {
 		}
 	} else {
 		if route.Gw != nil {
-			tk.LogIt(tk.LogError, "[NLP] RT  %s via %s added\n", ipNet.String(),
+			tk.LogIt(tk.LogInfo, "[NLP] RT  %s via %s added\n", ipNet.String(),
 				route.Gw.String())
 		} else {
-			tk.LogIt(tk.LogError, "[NLP] RT  %s added\n", ipNet.String())
+			tk.LogIt(tk.LogInfo, "[NLP] RT  %s added\n", ipNet.String())
 		}
 	}
 
@@ -1184,10 +1184,10 @@ func DelRoute(route nlp.Route) int {
 		}
 	} else {
 		if route.Gw != nil {
-			tk.LogIt(tk.LogError, "[NLP] RT  %s via %s deleted\n", ipNet.String(),
+			tk.LogIt(tk.LogInfo, "[NLP] RT  %s via %s deleted\n", ipNet.String(),
 				route.Gw.String())
 		} else {
-			tk.LogIt(tk.LogError, "[NLP] RT  %s deleted\n", ipNet.String())
+			tk.LogIt(tk.LogInfo, "[NLP] RT  %s deleted\n", ipNet.String())
 		}
 	}
 	return ret

diff --git a/loxinet/dpebpf_linux.go b/loxinet/dpebpf_linux.go
@@ -52,9 +52,10 @@ import (
 	"time"
 	"unsafe"
 
-	cmn "github.com/loxilb-io/loxilb/common"
 	tk "github.com/loxilb-io/loxilib"
 	nlp "github.com/vishvananda/netlink"
+
+	cmn "github.com/loxilb-io/loxilb/common"
 )
 
 // This file implements the interface DpHookInterface
@@ -1985,7 +1986,7 @@ func (e *DpEbpfH) DpCtDel(w *DpCtInfo) int {
 	mapKey := w.Key()
 	cti := mh.dpEbpf.ctMap[mapKey]
 	if cti == nil {
-		tk.LogIt(tk.LogError, "ctInfo-key (%v) not present\n", mapKey)
+		tk.LogIt(tk.LogDebug, "ctInfo-key (%v) not present\n", mapKey)
 		return 0
 	}
 

diff --git a/loxinet/rules.go b/loxinet/rules.go
@@ -23,17 +23,19 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/loxilb-io/loxilb/api/loxinlp"
-	cmn "github.com/loxilb-io/loxilb/common"
-	tk "github.com/loxilb-io/loxilib"
-	probing "github.com/prometheus-community/pro-bing"
 	"io/ioutil"
 	"net"
 	"reflect"
 	"sort"
 	"strconv"
 	"sync"
 	"time"
+
+	tk "github.com/loxilb-io/loxilib"
+	probing "github.com/prometheus-community/pro-bing"
+
+	"github.com/loxilb-io/loxilb/api/loxinlp"
+	cmn "github.com/loxilb-io/loxilb/common"
 )
 
 // error codes
@@ -357,7 +359,7 @@ func RulesInit(zone *Zone) *RuleH {
 			tk.LogIt(tk.LogError, "RootCA cert load failed : %v\n", err)
 		} else {
 			nRh.rootCAPool.AppendCertsFromPEM(rootCA)
-			tk.LogIt(tk.LogError, "RootCA cert loaded\n")
+			tk.LogIt(tk.LogDebug, "RootCA cert loaded\n")
 		}
 	}