handle closed channel

Author: Jan Naahs

src/wsclient.go

@@ -29,6 +29,7 @@ func (client *Client) Read() {
 			handler(client, message.Data)
 		}
 	}
+	client.socket.Close()
 }
 
 func (client *Client) Write() {
@@ -37,6 +38,7 @@ func (client *Client) Write() {
 			break
 		}
 	}
+	client.socket.Close()
 }
 
 func (client *Client) Close() {

src/wsroutes.go

@@ -7,6 +7,16 @@ import (
 	"github.com/hpcloud/tail"
 )
 
+func IsClosed(ch <-chan Message) bool {
+	select {
+	case <-ch:
+		return true
+	default:
+	}
+
+	return false
+}
+
 func logSubscribe(client *Client, data interface{}) {
 	go func() {
 		logfile := filepath.Join(config.FactorioDir, "factorio-server-console.log")
@@ -17,7 +27,12 @@ func logSubscribe(client *Client, data interface{}) {
 		}
 
 		for line := range t.Lines {
-			client.send <- Message{"log update", line.Text}
+			if !IsClosed(client.send) {
+				client.send <- Message{"log update", line.Text}
+			} else {
+				log.Printf("Channel was closed")
+				return
+			}
 		}
 	}()
 }
@@ -35,7 +50,12 @@ func commandSend(client *Client, data interface{}) {
 
 			log.Printf("Command send to Factorio: %s, with rcon request id: %v", data, reqId)
 
-			client.send <- Message{"receive command", data}
+			if !IsClosed(client.send) {
+				client.send <- Message{"receive command", data}
+			} else {
+				log.Printf("Channel was closed")
+				return
+			}
 		}()
 	}
 }