studio/shotgun
2
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

sync with heartbeat reader

Browse Source
This commit is contained in:
Branden J Brown 2024-02-02 21:18:03 -06:00
parent 30897827e4
commit e27e0f571d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server.go
View File

@ -197,7 +197,9 @@ func (s *Server) Queue(w http.ResponseWriter, r *http.Request) {
func (s *Server) joinAndServe(p person) { func (s *Server) joinAndServe(p person) {
slog.Debug("joining", "player", p.id) slog.Debug("joining", "player", p.id)
ctx, stop := context.WithTimeoutCause(context.Background(), 10*time.Minute, errQueueEmpty) ctx, stop := context.WithTimeoutCause(context.Background(), 10*time.Minute, errQueueEmpty)
ch := make(chan struct{})
go func() { go func() {
defer close(ch)
for { for {
_, _, err := p.conn.Read(context.Background()) _, _, err := p.conn.Read(context.Background())
if err != nil || ctx.Err() != nil { if err != nil || ctx.Err() != nil {
@ -207,6 +209,7 @@ func (s *Server) joinAndServe(p person) {
}() }()
id, chall, deal := s.l.Queue(ctx, p.id) id, chall, deal := s.l.Queue(ctx, p.id)
stop() stop()
<-ch
if id == (lobby.GameID{}) { if id == (lobby.GameID{}) {
// Context canceled. // Context canceled.
p.conn.Close(websocket.StatusTryAgainLater, "sorry, queue is empty...") p.conn.Close(websocket.StatusTryAgainLater, "sorry, queue is empty...")