From 802a18167c33869bf5fc61f8ebae5414dd5c4580 Mon Sep 17 00:00:00 2001 From: Zoltan Papp Date: Wed, 21 May 2025 20:18:21 +0200 Subject: [PATCH] [client] Do not reconnect to mgm server in case of handler error (#3856) * Do not reconnect to mgm server in case of handler error Set to nil the flow grpc client to nil * Better error handling --- client/internal/netflow/manager.go | 10 ++++++++-- management/client/grpc.go | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/client/internal/netflow/manager.go b/client/internal/netflow/manager.go index 0f1cdce37..bf80e5a9f 100644 --- a/client/internal/netflow/manager.go +++ b/client/internal/netflow/manager.go @@ -123,8 +123,14 @@ func (m *Manager) disableFlow() error { m.logger.Close() - if m.receiverClient != nil { - return m.receiverClient.Close() + if m.receiverClient == nil { + return nil + } + + err := m.receiverClient.Close() + m.receiverClient = nil + if err != nil { + return fmt.Errorf("close: %w", err) } return nil diff --git a/management/client/grpc.go b/management/client/grpc.go index 2f4729e23..e85e16e76 100644 --- a/management/client/grpc.go +++ b/management/client/grpc.go @@ -260,8 +260,6 @@ func (c *GrpcClient) receiveEvents(stream proto.ManagementService_SyncClient, se if err := msgHandler(decryptedResp); err != nil { log.Errorf("failed handling an update message received from Management Service: %v", err.Error()) - // hide any grpc error code that is not relevant for management - return fmt.Errorf("msg handler error: %v", err.Error()) } } }