chore: refactor log

(cherry picked from commit 9d821bc)
kubeovn · Nov 9, 2020 · 1fe4267 · 1fe4267
1 parent 0f1b74d
commit 1fe4267
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pkg/daemon/gateway.go b/pkg/daemon/gateway.go
@@ -102,9 +102,9 @@ func (c *Controller) runGateway() {
 			return
 		}
 		if !exists {
-			klog.Info("iptables rules not exist, recreate iptables rules")
+			klog.Infof("iptables rules %s not exist, recreate iptables rules", strings.Join(iptRule.Rule, " "))
 			if err := c.iptable.Insert(iptRule.Table, iptRule.Chain, 1, iptRule.Rule...); err != nil {
-				klog.Errorf("insert iptable rule %v failed, %+v", iptRule.Rule, err)
+				klog.Errorf("insert iptable rule %s failed, %+v", strings.Join(iptRule.Rule, " "), err)
 				return
 			}
 		}
@@ -292,7 +292,7 @@ func (c *Controller) appendMssRule() {
 		}
 
 		if !exists {
-			klog.Info("iptables rules not exist, append iptables rules")
+			klog.Infof("iptables rules %s not exist, append iptables rules", strings.Join(MssMangleRule.Rule, " "))
 			if err := c.iptable.Append(MssMangleRule.Table, MssMangleRule.Chain, MssMangleRule.Rule...); err != nil {
 				klog.Errorf("append iptable rule %v failed, %+v", MssMangleRule.Rule, err)
 				return

diff --git a/pkg/daemon/handler.go b/pkg/daemon/handler.go
@@ -188,9 +188,11 @@ func (csh cniServerHandler) handleDel(req *restful.Request, resp *restful.Respon
 		return
 	}
 	// check if it's a sriov device
-	for _, container := range pod.Spec.Containers {
-		if _, ok := container.Resources.Requests[util.SRIOVResourceName]; ok {
-			podRequest.DeviceID = util.SRIOVResourceName
+	if pod != nil {
+		for _, container := range pod.Spec.Containers {
+			if _, ok := container.Resources.Requests[util.SRIOVResourceName]; ok {
+				podRequest.DeviceID = util.SRIOVResourceName
+			}
 		}
 	}