Check message type after checking for error

rancher · Mar 22, 2016 · a149a33 · a149a33
1 parent 546e503
commit a149a33
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/rancher/service.go b/rancher/service.go
@@ -551,9 +551,6 @@ func (r *RancherService) pipeLogs(container *rancherClient.Container, conn *webs
 
 	for {
 		messageType, bytes, err := conn.ReadMessage()
-		if messageType != websocket.TextMessage {
-			continue
-		}
 
 		if err == io.EOF {
 			return
@@ -562,7 +559,7 @@ func (r *RancherService) pipeLogs(container *rancherClient.Container, conn *webs
 			return
 		}
 
-		if len(bytes) <= 3 {
+		if messageType != websocket.TextMessage || len(bytes) <= 3 {
 			continue
 		}