Merge pull request #29 from fisherxu/sync

kubeedge · Jun 1, 2021 · d832643 · d832643
2 parents e339319 + 76fc3a4
commit d832643
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/client/ws.go b/pkg/client/ws.go
@@ -68,13 +68,12 @@ func (c *WSClient) Connect() (conn.Connection, error) {
 	var respMsg string
 	if resp != nil {
 		body, errRead := ioutil.ReadAll(resp.Body)
-		if errRead != nil {
+		if errRead == nil {
 			respMsg = fmt.Sprintf("response code: %d, response body: %s", resp.StatusCode, string(body))
 		} else {
 			respMsg = fmt.Sprintf("response code: %d", resp.StatusCode)
 		}
 		resp.Body.Close()
-		return nil, err
 	}
 	klog.Errorf("dial websocket error(%+v), response message: %s", err, respMsg)
 

diff --git a/pkg/conn/ws.go b/pkg/conn/ws.go
@@ -114,8 +114,8 @@ func (conn *WSConnection) handleRawData() {
 }
 
 func (conn *WSConnection) handleMessage() {
-	msg := &model.Message{}
 	for {
+		msg := &model.Message{}
 		err := lane.NewLane(api.ProtocolTypeWS, conn.wsConn).ReadMessage(msg)
 		if err != nil {
 			if err != io.EOF {