Added PR and adapted test

Peter M. Groen
1 parent b7b0db4b
Showing 2 changed files with 8 additions and 7 deletions
src/mqttclient.cpp
test/SledgeHammerTest.cpp
@@ -73,6 +73,12 @@ MqttClient::MqttClient(const std::string&amp; _clientId, const std::function&lt;void(co
 MqttClient::~MqttClient()
 {
+    LogDebug( "MqttClient", std::string( m_clientId + " - dtor stop queue" ) );
+    m_eventQueue.stop();
+    if (m_workerThread.joinable()) {
+        m_workerThread.join();
+    }
+    
     {
         // LogDebug( "MqttClient", std::string( m_clientId + " - disconnect" ) );
         this->disconnect();
@@ -83,11 +89,6 @@ MqttClient::~MqttClient()
         m_principalClient.swap(principalClient);
     }
-    LogDebug( "MqttClient", std::string( m_clientId + " - dtor stop queue" ) );
-    m_eventQueue.stop();
-    if (m_workerThread.joinable()) {
-        m_workerThread.join();
-    }
     LogDebug( "MqttClient", std::string( m_clientId + " - dtor ready" ) );
 }
@@ -123,8 +123,8 @@ TEST(SledgeHammerTest, MultipleConnections_BurnTest)
     std::unordered_map<std::string, Publisher *> publishers;
     const int max_run = 100;
-    const int max_connections = 10;
-    const int max_messages = 10;
+    const int max_connections = 5;
+    const int max_messages = 100;
     for (int test_run = 0; test_run < max_run; test_run++)
     {