X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/098a6b73cd5b7ad391ed30e95b825817d22aec24..7db74f672f64b3e647a98c1d8e5978b50d79538d:/services/ws/service.go

diff --git a/services/ws/service.go b/services/ws/service.go
index c38dcf59e6..9a4a239ea1 100644
--- a/services/ws/service.go
+++ b/services/ws/service.go
@@ -7,6 +7,7 @@ package ws
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"git.arvados.org/arvados.git/lib/cmd"
 	"git.arvados.org/arvados.git/lib/service"
@@ -24,11 +25,13 @@ func newHandler(ctx context.Context, cluster *arvados.Cluster, token string, reg
 	if err != nil {
 		return service.ErrorHandler(ctx, cluster, fmt.Errorf("error initializing client from cluster config: %s", err))
 	}
+	client.Timeout = time.Minute
 	eventSource := &pgEventSource{
 		DataSource:   cluster.PostgreSQL.Connection.String(),
 		MaxOpenConns: cluster.PostgreSQL.ConnectionPool,
 		QueueSize:    cluster.API.WebsocketServerEventQueue,
 		Logger:       ctxlog.FromContext(ctx),
+		Reg:          reg,
 	}
 	done := make(chan struct{})
 	go func() {
@@ -44,8 +47,9 @@ func newHandler(ctx context.Context, cluster *arvados.Cluster, token string, reg
 		cluster:        cluster,
 		client:         client,
 		eventSource:    eventSource,
-		newPermChecker: func() permChecker { return newPermChecker(*client) },
+		newPermChecker: func() permChecker { return newPermChecker(client) },
 		done:           done,
+		reg:            reg,
 	}
 	return rtr
 }