open_source / mqtt-cpp

Commit 46a66fbb4bfdabf1371b3c40d1cc8a444c3a4a52

Authored by Peter M. Groen
2 parents 1ffaa75b 9802eeb9

Merge branch '5-mqttclient_publish_error' into 'master' 

5 mqttclient publish error

See merge request !17
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
src/clientpaho.cpp
  View file @46a66fb
... ... @@ -377,10 +377,10 @@ std::int32_t ClientPaho::publish( const MqttMessage& message, int qos )
377 377 }
378 378  
379 379 std::unique_lock<std::mutex> lck(m_mutex);
380   - if( ConnectionStatus::ReconnectInProgress == m_connectionStatus || m_processPendingPublishes )
  380 + if( ConnectionStatus::Connected != m_connectionStatus || m_processPendingPublishes )
381 381 {
382 382 m_pendingPublishesReadyCV.wait(lck, [this]() { return !m_processPendingPublishes; });
383   - if( ConnectionStatus::ReconnectInProgress == m_connectionStatus )
  383 + if( ConnectionStatus::Connected != m_connectionStatus )
384 384 {
385 385 LogDebug( "[ClientPaho::publish]", "Adding publish to pending queue." );
386 386 m_pendingPublishes.push_front( Publish{ qos, message } );
... ... @@ -789,6 +789,8 @@ void ClientPaho::onConnectOnInstance( const std::string&amp; cause )
789 789  
790 790 void ClientPaho::onConnectSuccessOnInstance()
791 791 {
  792 + m_processPendingPublishes = true;
  793 +
792 794 LogDebug( "[ClientPaho::onConnectSuccessOnInstance]",
793 795 std::string( m_clientId + " - onConnectSuccessOnInstance triggered." ) );
794 796 {
... ...