sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-19 06:59:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

client: enhance gRPC logging with conditional output and improved error handling

Browse Source
This commit is contained in:
Hakan Sariman
2025-03-27 22:46:31 +08:00
parent f8f5588b94
commit 8ba08cfaa3
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
client/grpc/logger/logger.go
View File

@@ -2,9 +2,10 @@ package logger
import (
"context"
"os"
"time"
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
@@ -22,15 +23,19 @@ func UnaryClientInterceptor() grpc.UnaryClientInterceptor {
) error {
start := time.Now()
// og the request
if msg, ok := req.(proto.Message); ok {
if jsonReq, err := protojson.Marshal(msg); err == nil {
logrus.Debugf("gRPC request initiated: method=%s, request=%s", method, jsonReq)
isStdout := log.StandardLogger().Out == os.Stdout
if !isStdout {
// log the request
if msg, ok := req.(proto.Message); ok {
if jsonReq, err := protojson.Marshal(msg); err == nil {
log.Debugf("gRPC request initiated: method=%s, request=%s", method, jsonReq)
} else {
log.Warnf("Could not marshal gRPC request: method=%s, error=%v", method, err)
}
} else {
logrus.Warnf("Could not marshal gRPC request: method=%s, error=%v", method, err)
log.Debugf("gRPC request initiated: method=%s, requestType=%T", method, req)
}
} else {
logrus.Debugf("gRPC request initiated: method=%s, requestType=%T", method, req)
}
err := invoker(ctx, method, req, reply, cc, opts...)
@@ -38,17 +43,19 @@ func UnaryClientInterceptor() grpc.UnaryClientInterceptor {
duration := time.Since(start)
// log the response
if err != nil {
logrus.Errorf("gRPC request failed: method=%s, duration=%v, error=%v", method, duration, err)
} else {
if msg, ok := reply.(proto.Message); ok {
if jsonReply, err := protojson.Marshal(msg); err == nil {
logrus.Debugf("gRPC request succeeded: method=%s, duration=%v, response=%s", method, duration, jsonReply)
} else {
logrus.Warnf("Could not marshal gRPC response: method=%s, error=%v", method, err)
}
if !isStdout {
if err != nil {
log.Errorf("gRPC request failed: method=%s, duration=%v, error=%v", method, duration, err)
} else {
logrus.Debugf("gRPC request succeeded: method=%s, duration=%v, responseType=%T", method, duration, reply)
if msg, ok := reply.(proto.Message); ok {
if jsonReply, err := protojson.Marshal(msg); err == nil {
log.Debugf("gRPC request succeeded: method=%s, duration=%v, response=%s", method, duration, jsonReply)
} else {
log.Warnf("Could not marshal gRPC response: method=%s, error=%v", method, err)
}
} else {
log.Debugf("gRPC request succeeded: method=%s, duration=%v, responseType=%T", method, duration, reply)
}
}
}

1
client/internal/peer/ice/agent.go
View File

@@ -51,6 +51,7 @@ func NewAgent(iFaceDiscover stdnet.ExternalIFaceDiscover, config Config, candida
RelayAcceptanceMinWait: &iceRelayAcceptanceMinWait,
LocalUfrag: ufrag,
LocalPwd: pwd,
LoggerFactory: newLogrusFactory(log.StandardLogger()),
}
if config.DisableIPv6Discovery {