luzifer/twitch-bot
1
0
Fork 0
mirror of https://github.com/Luzifer/twitch-bot.git synced 2024-11-08 16:20:02 +00:00
Code Issues Projects Releases Wiki Activity

[core] Add timeout to eventsub connection dialer

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2023-11-05 11:50:56 +01:00
parent a2ffc25a26
commit cb68b029ec
Signed by: luzifer
GPG key ID: D91C3E91E4CAD6F5
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/twitch/eventsubWebsocketClient.go
View file

@ -18,6 +18,7 @@ import (
const ( const (
eventsubLiveSocketDest = "wss://eventsub.wss.twitch.tv/ws" eventsubLiveSocketDest = "wss://eventsub.wss.twitch.tv/ws"
socketConnectTimeout = 15 * time.Second
socketInitialTimeout = 30 * time.Second socketInitialTimeout = 30 * time.Second
socketTimeoutGraceMultiplier = 1.5 socketTimeoutGraceMultiplier = 1.5
) )
@ -242,7 +243,10 @@ func (e *EventSubSocketClient) Run() error {
func (e *EventSubSocketClient) connect(url string, msgC chan eventSubSocketMessage, errC chan error, reason string) error { func (e *EventSubSocketClient) connect(url string, msgC chan eventSubSocketMessage, errC chan error, reason string) error {
e.logger.WithField("reason", reason).Debug("(re-)connecting websocket") e.logger.WithField("reason", reason).Debug("(re-)connecting websocket")
conn, _, err := websocket.DefaultDialer.Dial(url, nil) //nolint:bodyclose // Close is implemented at other place ctx, cancel := context.WithTimeout(context.Background(), socketConnectTimeout)
defer cancel()
conn, _, err := websocket.DefaultDialer.DialContext(ctx, url, nil) //nolint:bodyclose // Close is implemented at other place
if err != nil { if err != nil {
return errors.Wrap(err, "dialing websocket") return errors.Wrap(err, "dialing websocket")
} }
@ -403,7 +407,7 @@ func (e *EventSubSocketClient) subscribe() error {
return errors.Wrapf(err, "subscribing to %s/%s", st.Event, st.Version) return errors.Wrapf(err, "subscribing to %s/%s", st.Event, st.Version)
} }
e.logger.WithField("topic", strings.Join([]string{st.Event, st.Version}, "/")).Debug("subscripted to topic") e.logger.WithField("topic", strings.Join([]string{st.Event, st.Version}, "/")).Debug("subscribed to topic")
} }
return nil return nil