mirrors
/
gotosocial
mirror of
1
Fork 0
Code Issues Releases Activity

[chore] Fix loop issue in streaming 🤦 (#3457)

This commit is contained in:
tobi 2024-10-18 16:57:50 +02:00 committed by GitHub
parent 602c858379
commit 0d0314b98d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
internal/api/client/streaming/stream.go
View File

@ -399,7 +399,7 @@ func (m *Module) writeToWSConn(
// - receipt of msg // - receipt of msg
// - timeout of pingCtx // - timeout of pingCtx
// - stream closed. // - stream closed.
msg, gotMsg := stream.Recv(pingCtx) msg, haveMsg := stream.Recv(pingCtx)
// If ping context has timed // If ping context has timed
// out, we should send a ping. // out, we should send a ping.
@ -410,35 +410,38 @@ func (m *Module) writeToWSConn(
cncl() cncl()
switch { switch {
case !haveMsg && !shouldPing:
// We have no message and we shouldn't
// send a ping; this means the stream
// has been closed from the client's end,
// so there's nothing further to do here.
l.Trace("no message and we shouldn't ping, returning...")
return
case haveMsg:
// We have a message to stream. // We have a message to stream.
case gotMsg:
l.Tracef("writing websocket message: %+v", msg) l.Tracef("writing websocket message: %+v", msg)
if err := wsConn.WriteJSON(msg); err != nil { if err := wsConn.WriteJSON(msg); err != nil {
// If there's an error writing then drop the // If there's an error writing then drop the
// connection, as client may have disappeared // connection, as client may have disappeared
// suddenly; they can reconnect if necessary. // suddenly; they can reconnect if necessary.
l.Debugf("error writing websocket message: %v", err) l.Debugf("error writing websocket message: %v", err)
break return
} }
// We have no message but we
// need to send a keep-alive ping.
case shouldPing: case shouldPing:
// We have no message but we do
// need to send a keep-alive ping.
l.Trace("writing websocket ping") l.Trace("writing websocket ping")
if err := wsConn.WriteControl(websocket.PingMessage, pingMsg, time.Time{}); err != nil { if err := wsConn.WriteControl(websocket.PingMessage, pingMsg, time.Time{}); err != nil {
// If there's an error writing then drop the // If there's an error writing then drop the
// connection, as client may have disappeared // connection, as client may have disappeared
// suddenly; they can reconnect if necessary. // suddenly; they can reconnect if necessary.
l.Debugf("error writing websocket ping: %v", err) l.Debugf("error writing websocket ping: %v", err)
break
}
// We have no message and we shouldn't
// send a ping; this means the stream
// has been closed from the client's end.
default:
return return
} }
} }
} }
}