Explorar o código

Merge pull request #1310 from porter-dev/belanger/por-102-websocket-panic

Undo WS panic fixes
abelanger5 %!s(int64=4) %!d(string=hai) anos
pai
achega
9683a4cab1
Modificáronse 1 ficheiros con 1 adicións e 2 borrados
  1. 1 2
      internal/kubernetes/provisioner/resource_stream.go

+ 1 - 2
internal/kubernetes/provisioner/resource_stream.go

@@ -10,7 +10,6 @@ import (
 // ResourceStream performs an XREAD operation on the given stream and outputs it to the given websocket conn.
 func ResourceStream(client *redis.Client, streamName string, rw *websocket.WebsocketSafeReadWriter) error {
 	errorchan := make(chan error)
-	defer close(errorchan)
 
 	go func() {
 		// listens for websocket closing handshake
@@ -35,7 +34,6 @@ func ResourceStream(client *redis.Client, streamName string, rw *websocket.Webso
 			).Result()
 
 			if err != nil {
-				errorchan <- err
 				return
 			}
 
@@ -49,6 +47,7 @@ func ResourceStream(client *redis.Client, streamName string, rw *websocket.Webso
 	for {
 		select {
 		case err := <-errorchan:
+			close(errorchan)
 			client.Close()
 			return err
 		}