DEVOPS-10175 windows connection loop stopvar

BITERP · Jun 5, 2024 · fd61e0a · fd61e0a
1 parent 9fa084e
commit fd61e0a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/windows/ConnectionImpl.cpp b/src/windows/ConnectionImpl.cpp
@@ -12,9 +12,7 @@ ConnectionImpl::ConnectionImpl(const AMQP::Address& address) :
 ConnectionImpl::~ConnectionImpl() {
 	closeChannel(trChannel);
 	closeChannel(rcChannel);
-	if (connection->usable()) {
-		connection->close();
-	}
+	handler.stopLoop();
 	thread.join();
 	connection.reset(nullptr);
 }

diff --git a/src/windows/SimplePocoHandler.cpp b/src/windows/SimplePocoHandler.cpp
@@ -124,7 +124,7 @@ SimplePocoHandler::~SimplePocoHandler()
 	close();
 }
 
-void SimplePocoHandler::setConnection(AMQP::Connection* connection)
+void SimplePocoHandler::setConnection(AMQP::Connection* connection): stop(false)
 {
 	m_impl->connection = connection;
 }
@@ -136,8 +136,7 @@ void SimplePocoHandler::loopThread(SimplePocoHandler* obj)
 
 void SimplePocoHandler::loopRead()
 {
-
-	while (m_impl->connection->usable())
+	while (!stop)
 	{
 		try
 		{

diff --git a/src/windows/SimplePocoHandler.h b/src/windows/SimplePocoHandler.h
@@ -18,6 +18,7 @@ class SimplePocoHandler: public AMQP::ConnectionHandler
 
     void setConnection(AMQP::Connection* connection);
  	void loopRead();
+ 	inline void stopLoop() {stop=true;}
 	static void loopThread(SimplePocoHandler* clazz);
 	void loopIteration();
     inline const std::string& getError(){ return error;}
@@ -43,6 +44,7 @@ class SimplePocoHandler: public AMQP::ConnectionHandler
 
     std::shared_ptr<SimplePocoHandlerImpl> m_impl;
     std::string error;
+    volatile bool stop;
 
 };