Fix small race at shutdown, don't start prometheus if not prod
This commit is contained in:
parent
577575a430
commit
9464868137
|
@ -239,15 +239,20 @@ func (r *Room) HandleConn(playerID uuid.UUID, nickname string, c *websocket.Conn
|
||||||
|
|
||||||
r.mu.Lock()
|
r.mu.Lock()
|
||||||
r.players[playerID] = func(s protocol.ServerNote) {
|
r.players[playerID] = func(s protocol.ServerNote) {
|
||||||
g.Go(func() error {
|
if ctx.Err() != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// It's not safe to start more group goroutines concurrently; just use a regular
|
||||||
|
// goroutine and hope that errors here will be reflected later via ping/receive failures.
|
||||||
|
go func() {
|
||||||
ctx, cancel := context.WithTimeout(ctx, time.Second)
|
ctx, cancel := context.WithTimeout(ctx, time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
if err := wsjson.Write(ctx, c, &s); err != nil {
|
if err := wsjson.Write(ctx, c, &s); err != nil {
|
||||||
return err
|
return
|
||||||
}
|
}
|
||||||
metricSent.Inc()
|
metricSent.Inc()
|
||||||
return nil
|
}()
|
||||||
})
|
|
||||||
}
|
}
|
||||||
r.room.AddPlayer(playerID, nickname)
|
r.room.AddPlayer(playerID, nickname)
|
||||||
r.sendAll()
|
r.sendAll()
|
||||||
|
|
Loading…
Reference in New Issue