v0.0.18.4 Фикс переподключения к rabbit
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
7f48fb767f
commit
d48eb31edc
@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log"
|
||||
"math"
|
||||
"tailly_back_v2/internal/domain"
|
||||
"tailly_back_v2/proto"
|
||||
"time"
|
||||
@ -126,16 +127,25 @@ func (r *subscriptionResolver) MessageStream(ctx context.Context, userID int) (<
|
||||
go func() {
|
||||
defer close(messageChan)
|
||||
|
||||
retryDelay := time.Second
|
||||
|
||||
for {
|
||||
stream, err := r.MessageClient.StreamMessages(ctx, &proto.StreamMessagesRequest{
|
||||
// Создаем новый контекст с таймаутом
|
||||
streamCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||
|
||||
stream, err := r.MessageClient.StreamMessages(streamCtx, &proto.StreamMessagesRequest{
|
||||
UserId: int32(userID),
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
cancel()
|
||||
log.Printf("Failed to stream messages: %v", err)
|
||||
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-time.After(5 * time.Second): // Задержка перед повторной попыткой
|
||||
case <-time.After(retryDelay):
|
||||
retryDelay = time.Duration(math.Min(float64(retryDelay*2), float64(30*time.Second)))
|
||||
continue
|
||||
}
|
||||
}
|
||||
@ -143,11 +153,14 @@ func (r *subscriptionResolver) MessageStream(ctx context.Context, userID int) (<
|
||||
for {
|
||||
msg, err := stream.Recv()
|
||||
if err != nil {
|
||||
cancel()
|
||||
log.Printf("Stream receive error: %v", err)
|
||||
break
|
||||
}
|
||||
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
cancel()
|
||||
return
|
||||
case messageChan <- protoMessageToDomain(msg.Message):
|
||||
}
|
||||
|
||||
@ -17,6 +17,7 @@ import (
|
||||
"tailly_back_v2/internal/http/middleware"
|
||||
"tailly_back_v2/internal/service"
|
||||
"tailly_back_v2/pkg/auth"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Server struct {
|
||||
@ -84,6 +85,7 @@ func (s *Server) configureRouter() {
|
||||
return false
|
||||
},
|
||||
},
|
||||
KeepAlivePingInterval: 10 * time.Second,
|
||||
}
|
||||
|
||||
srv.AddTransport(&wsTransport)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user