Merge pull request #71 from Jefftree/reduce-log

Prevent logging packet data in client

Author: k8s-ci-robot

konnectivity-client/pkg/client/client.go

@@ -88,7 +88,7 @@ func (t *grpcTunnel) serve() {
 			return
 		}
 
-		klog.Infof("[tracing] recv packet %+v", pkt)
+		klog.V(6).Infof("[tracing] recv packet, type: %s", pkt.Type)
 
 		switch pkt.Type {
 		case client.PacketType_DIAL_RSP:
@@ -165,7 +165,7 @@ func (t *grpcTunnel) Dial(protocol, address string) (net.Conn, error) {
 			},
 		},
 	}
-	klog.Infof("[tracing] send packet %+v", req)
+	klog.V(6).Infof("[tracing] send packet, type: %s", req.Type)
 
 	err := t.stream.Send(req)
 	if err != nil {

konnectivity-client/pkg/client/conn.go

@@ -54,7 +54,7 @@ func (c *conn) Write(data []byte) (n int, err error) {
 		},
 	}
 
-	klog.Infof("[tracing] send req %+v", req)
+	klog.V(6).Infof("[tracing] send req, type: %s", req.Type)
 
 	err = c.stream.Send(req)
 	if err != nil {
@@ -122,7 +122,7 @@ func (c *conn) Close() error {
 		},
 	}
 
-	klog.Infof("[tracing] send req %+v", req)
+	klog.V(6).Infof("[tracing] send req, type: %s", req.Type)
 
 	if err := c.stream.Send(req); err != nil {
 		return err

pkg/agent/agentclient/client.go

@@ -117,7 +117,7 @@ func (a *AgentClient) Serve() {
 			return
 		}
 
-		klog.Infof("[tracing] recv packet %+v", pkt)
+		klog.Infof("[tracing] recv packet, type: %s", pkt.Type)
 
 		if pkt == nil {
 			klog.Warningf("empty packet received")
@@ -183,7 +183,6 @@ func (a *AgentClient) Serve() {
 		case client.PacketType_DATA:
 			data := pkt.GetData()
 			klog.Infof("received DATA(id=%d)", data.ConnectID)
-			klog.Infof("[tracing] %v", data)
 
 			if ctx, ok := a.connContext[data.ConnectID]; ok {
 				ctx.dataCh <- data.Data

pkg/agent/agentserver/tunnel.go

@@ -127,7 +127,7 @@ func (t *Tunnel) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			klog.Errorf("error sending packet %v", err)
 			continue
 		}
-		klog.Infof("Forwarding on tunnel, packet %v", string(pkt[:n]))
+		klog.Infof("Forwarding on tunnel, packet type: %s", packet.Type)
 	}
 
 	klog.Infof("Stopping transfer to %q", r.Host)