Browse Source

FIX #18 server close connections

I am not sure this really fixes the problem (but it seems to)
boyska 4 years ago
parent
commit
5717c7ca29
2 changed files with 9 additions and 1 deletions
  1. 1 1
      cmd/circolog-tail/main.go
  2. 8 0
      cmd/circologd/http_log.go

+ 1 - 1
cmd/circolog-tail/main.go

@@ -149,7 +149,7 @@ func main() {
 			select {
 			case <-done:
 				log.Println("Successfully close")
-			case <-time.After(1 * time.Second):
+			case <-time.After(5 * time.Second):
 				log.Println("Forced close")
 			}
 			return

+ 8 - 0
cmd/circologd/http_log.go

@@ -153,6 +153,14 @@ func getWSHandler(hub circolog.Hub) http.HandlerFunc {
 				hub.Unregister <- c
 				conn.Close()
 			}()
+			go func() {
+				for {
+					_, _, err := conn.ReadMessage()
+					if err != nil {
+						return
+					}
+				}
+			}()
 			for {
 				select {
 				case message, ok := <-c.Messages: