From fe6023b18dd95858ee299d92c7324930540dd1e4 Mon Sep 17 00:00:00 2001
From: Ivan Chvets <ivan.chvets@kinarasystems.com>
Date: Thu, 1 May 2025 17:49:04 -0400
Subject: [PATCH] Exception handling improvement. Details in:
 https://telecominfraproject.atlassian.net/browse/WIFI-14038

Signed-off-by: Ivan Chvets <ivan.chvets@kinarasystems.com>
---
 src/framework/KafkaManager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/framework/KafkaManager.cpp b/src/framework/KafkaManager.cpp
index c72b295..20faf37 100644
--- a/src/framework/KafkaManager.cpp
+++ b/src/framework/KafkaManager.cpp
@@ -118,6 +118,10 @@ namespace OpenWifi {
 						Producer.poll((std::chrono::milliseconds) 0);
 					}
 				}
+		                if (Queue_.size() == 0) {
+					// message queue is empty, flush all previously sent messages
+					Producer.flush();
+				}
 			} catch (const cppkafka::HandleException &E) {
 				poco_warning(Logger_,
 							 fmt::format("Caught a Kafka exception (producer): {}", E.what()));
@@ -126,10 +130,6 @@ namespace OpenWifi {
 			} catch (...) {
 				poco_error(Logger_, "std::exception");
 			}
-			if (Queue_.size() == 0) {
-				// message queue is empty, flush all previously sent messages
-				Producer.flush();
-			}
 			Note = Queue_.waitDequeueNotification();
 		}
 		Producer.flush();