Fix up websocket locking.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --git a/arvados.go b/arvados.go
index ca967824b51a98f204ff482013e7a1c539bc0930..bd4f58a5e5f0f2057af77c0bd2b3a9eb1e0110bd 100644 (file)
--- a/arvados.go
+++ b/arvados.go
@@ -126,20 +126,28 @@ reconnect:
                        time.Sleep(5 * time.Second)
                        continue reconnect
                }
+               log.Printf("connected to websocket at %s", wsURL)
+
                client.mtx.Lock()
                client.wsconn = conn
-               client.mtx.Unlock()
-
-               w := json.NewEncoder(conn)
+               resubscribe := make([]string, 0, len(client.notifying))
                for uuid := range client.notifying {
-                       w.Encode(map[string]interface{}{
-                               "method": "subscribe",
-                               "filters": [][]interface{}{
-                                       {"object_uuid", "=", uuid},
-                                       {"event_type", "in", []string{"stderr", "crunch-run", "update"}},
-                               },
-                       })
+                       resubscribe = append(resubscribe, uuid)
                }
+               client.mtx.Unlock()
+
+               go func() {
+                       w := json.NewEncoder(conn)
+                       for _, uuid := range resubscribe {
+                               w.Encode(map[string]interface{}{
+                                       "method": "subscribe",
+                                       "filters": [][]interface{}{
+                                               {"object_uuid", "=", uuid},
+                                               {"event_type", "in", []string{"stderr", "crunch-run", "update"}},
+                                       },
+                               })
+                       }
+               }()
 
                r := json.NewDecoder(conn)
                for {
@@ -157,9 +165,11 @@ reconnect:
                                        go conn.Close()
                                        continue reconnect
                                }
+                               client.mtx.Lock()
                                for ch := range client.notifying[msg.ObjectUUID] {
                                        ch <- msg
                                }
+                               client.mtx.Unlock()
                        }
                }
        }