Don't log token in websocket url.

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

diff --git a/arvados.go b/arvados.go
index bd4f58a5e5f0f2057af77c0bd2b3a9eb1e0110bd..8fd556e8d7829acb918e8808d446f0e63c3dfb3a 100644 (file)
--- a/arvados.go
+++ b/arvados.go
@@ -119,6 +119,7 @@ reconnect:
                wsURL := cluster.Services.Websocket.ExternalURL
                wsURL.Scheme = strings.Replace(wsURL.Scheme, "http", "ws", 1)
                wsURL.Path = "/websocket"
                wsURL := cluster.Services.Websocket.ExternalURL
                wsURL.Scheme = strings.Replace(wsURL.Scheme, "http", "ws", 1)
                wsURL.Path = "/websocket"

+               wsURLNoToken := wsURL.String()

                wsURL.RawQuery = url.Values{"api_token": []string{client.AuthToken}}.Encode()
                conn, err := websocket.Dial(wsURL.String(), "", cluster.Services.Controller.ExternalURL.String())
                if err != nil {
                wsURL.RawQuery = url.Values{"api_token": []string{client.AuthToken}}.Encode()
                conn, err := websocket.Dial(wsURL.String(), "", cluster.Services.Controller.ExternalURL.String())
                if err != nil {


@@ -126,7 +127,7 @@ reconnect:
                        time.Sleep(5 * time.Second)
                        continue reconnect
                }
                        time.Sleep(5 * time.Second)
                        continue reconnect
                }

-               log.Printf("connected to websocket at %s", wsURL)
+               log.Printf("connected to websocket at %s", wsURLNoToken)

 
                client.mtx.Lock()
                client.wsconn = conn
 
                client.mtx.Lock()
                client.wsconn = conn