Fix race condition when running hub

go-goyave · Apr 29, 2024 · 4f913de · 4f913de
1 parent 2d119f0
commit 4f913de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/http/controller/chat/hub.go b/http/controller/chat/hub.go
@@ -30,7 +30,7 @@ type Hub struct {
 }
 
 // NewHub create a new chat Hub.
-func NewHub(server *goyave.Server) *Hub {
+func NewHub() *Hub {
 	ctx, cancel := context.WithCancel(context.Background())
 	hub := &Hub{
 		broadcast:  make(chan []byte, 256),
@@ -40,7 +40,6 @@ func NewHub(server *goyave.Server) *Hub {
 		ctx:        ctx,
 		cancel:     cancel,
 	}
-	hub.Init(server)
 	return hub
 }
 

diff --git a/http/route/route.go b/http/route/route.go
@@ -17,10 +17,10 @@ func Register(server *goyave.Server, router *goyave.Router) {
 	router.GlobalMiddleware(&parse.Middleware{})
 	router.GlobalMiddleware(log.CombinedLogMiddleware())
 
-	hub := chat.NewHub(server)
-	go hub.Run()
+	hub := chat.NewHub()
 
 	router.Subrouter("/chat").Controller(websocket.New(hub))
+	go hub.Run()
 
 	resources := server.Service(service.Static).(*static.Service).FS()
 	router.Static(resources, "/", false)