v0.0.18.5 Добавление логирование для ws и stream
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
93f3a68de9
commit
7cbf071532
@ -3,6 +3,7 @@ package graph
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
"tailly_back_v2/internal/domain"
|
"tailly_back_v2/internal/domain"
|
||||||
"tailly_back_v2/proto"
|
"tailly_back_v2/proto"
|
||||||
"time"
|
"time"
|
||||||
@ -128,15 +129,18 @@ func (r *subscriptionResolver) MessageStream(ctx context.Context, userID int) (<
|
|||||||
stream, err := r.MessageClient.StreamMessages(ctx, &proto.StreamMessagesRequest{
|
stream, err := r.MessageClient.StreamMessages(ctx, &proto.StreamMessagesRequest{
|
||||||
UserId: int32(userID),
|
UserId: int32(userID),
|
||||||
})
|
})
|
||||||
|
log.Printf("stream messages: %v", stream)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to stream messages: %w", err)
|
return nil, fmt.Errorf("failed to stream messages: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
messageChan := make(chan *domain.Message)
|
messageChan := make(chan *domain.Message)
|
||||||
|
log.Printf("messageChan: %d", messageChan)
|
||||||
go func() {
|
go func() {
|
||||||
defer close(messageChan)
|
defer close(messageChan)
|
||||||
for {
|
for {
|
||||||
msg, err := stream.Recv()
|
msg, err := stream.Recv()
|
||||||
|
log.Printf("recv message: %v", msg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package middleware
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"tailly_back_v2/pkg/auth"
|
"tailly_back_v2/pkg/auth"
|
||||||
)
|
)
|
||||||
@ -14,6 +15,7 @@ func WSAuthMiddleware(tokenAuth *auth.TokenAuth) func(http.Handler) http.Handler
|
|||||||
if r.Header.Get("Upgrade") == "websocket" {
|
if r.Header.Get("Upgrade") == "websocket" {
|
||||||
// Извлекаем токен из query параметров или заголовков
|
// Извлекаем токен из query параметров или заголовков
|
||||||
token := extractTokenFromRequest(r)
|
token := extractTokenFromRequest(r)
|
||||||
|
log.Printf("token ws: %s", token)
|
||||||
|
|
||||||
if token != "" {
|
if token != "" {
|
||||||
userID, err := tokenAuth.ValidateAccessToken(token)
|
userID, err := tokenAuth.ValidateAccessToken(token)
|
||||||
|
|||||||
@ -76,6 +76,7 @@ func (s *Server) configureRouter() {
|
|||||||
Upgrader: websocket.Upgrader{
|
Upgrader: websocket.Upgrader{
|
||||||
CheckOrigin: func(r *http.Request) bool {
|
CheckOrigin: func(r *http.Request) bool {
|
||||||
origin := r.Header.Get("Origin")
|
origin := r.Header.Get("Origin")
|
||||||
|
log.Printf("origin: %s", origin)
|
||||||
for _, allowed := range allowedOrigins {
|
for _, allowed := range allowedOrigins {
|
||||||
if origin == allowed {
|
if origin == allowed {
|
||||||
return true
|
return true
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user