timeout on disconnect

Author: douglascdev

hashbot/hashbot.go

@@ -272,9 +272,20 @@ func (t *HashBot) ReconnectClient() error {
 func (t *HashBot) ConnectClient(login string, token string) error {
 	var err error
 
+	ErrDisconnectTimeout := errors.New("disconnect timed out")
+
 	if t.TwitchClient != nil {
-		err = t.TwitchClient.Disconnect()
-		if !errors.Is(err, twitch.ErrConnectionIsNotOpen) {
+		result := make(chan error, 1)
+		go func() {
+			result <- t.TwitchClient.Disconnect()
+		}()
+		select {
+		case err = <-result:
+		case <-time.After(time.Second * 5):
+			err = ErrDisconnectTimeout
+		}
+
+		if !errors.Is(err, twitch.ErrConnectionIsNotOpen) && !errors.Is(err, ErrDisconnectTimeout) {
 			return err
 		}
 	}

main.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	flag "github.com/spf13/pflag"
 	"hashbot/backend"
 	"hashbot/command"
 	"hashbot/config"
@@ -17,6 +16,8 @@ import (
 	"sort"
 	"time"
 
+	flag "github.com/spf13/pflag"
+
 	"github.com/gempir/go-twitch-irc/v4"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"