Merge pull request #439 from mtconnect/438_mqtt_ingress_issues_on_cur…

…rent_build

Fixed port in url for MQTT service.

CMakeLists.txt

@@ -2,7 +2,8 @@
 set(AGENT_VERSION_MAJOR 2)
 set(AGENT_VERSION_MINOR 3)
 set(AGENT_VERSION_PATCH 0)
-set(AGENT_VERSION_BUILD 6)
+set(AGENT_VERSION_BUILD 7
+)
 set(AGENT_VERSION_RC "")
 
 # This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent

src/mtconnect/mqtt/mqtt_client_impl.hpp

@@ -164,6 +164,7 @@ namespace mtconnect {
           m_connected = false;
           if (m_handler && m_handler->m_disconnected)
             m_handler->m_disconnected(shared_from_this());
+            m_handler->m_disconnected(shared_from_this());
           if (m_running)
           {
             reconnect();
@@ -235,6 +236,7 @@ namespace mtconnect {
           {
             client->async_disconnect(10s, [client, url](mqtt::error_code ec) {
               LOG(warning) << url << " disconnected: " << ec.message();
+              client->set_close_handler(nullptr);
             });
 
             client.reset();
@@ -411,6 +413,13 @@ namespace mtconnect {
     public:
       using base = MqttClientImpl<MqttTcpClient>;
       using base::base;
+      /// @brief Get a shared pointer to this
+      /// @return shared pointer to this
+      shared_ptr<MqttTcpClient> getptr()
+      {
+        return static_pointer_cast<MqttTcpClient>(shared_from_this());
+      }
+
       /// @brief Get the Mqtt TCP Client
       /// @return pointer to the Mqtt TCP Client
       auto &getClient()
@@ -437,6 +446,12 @@ namespace mtconnect {
     public:
       using base = MqttClientImpl<MqttTlsClient>;
       using base::base;
+      /// @brief Get a shared pointer to this
+      /// @return shared pointer to this
+      shared_ptr<MqttTlsClient> getptr()
+      {
+        return static_pointer_cast<MqttTlsClient>(shared_from_this());
+      }
 
       /// @brief Get the Mqtt TLS Client
       /// @return pointer to the Mqtt TLS Client
@@ -480,6 +495,13 @@ namespace mtconnect {
     public:
       using base = MqttClientImpl<MqttTlsWSClient>;
       using base::base;
+      /// @brief Get a shared pointer to this
+      /// @return shared pointer to this
+      shared_ptr<MqttTlsWSClient> getptr()
+      {
+        return static_pointer_cast<MqttTlsWSClient>(shared_from_this());
+      }
+
       /// @brief Get the Mqtt TLS WebSocket Client
       /// @return pointer to the Mqtt TLS WebSocket Client
       auto &getClient()
@@ -512,6 +534,13 @@ namespace mtconnect {
     public:
       using base = MqttClientImpl<MqttWSClient>;
       using base::base;
+      /// @brief Get a shared pointer to this
+      /// @return shared pointer to this
+      shared_ptr<MqttWSClient> getptr()
+      {
+        return static_pointer_cast<MqttWSClient>(shared_from_this());
+      }
+
       /// @brief Get the Mqtt TLS WebSocket Client
       /// @return pointer to the Mqtt TLS WebSocket Client
       auto &getClient()

src/mtconnect/source/adapter/mqtt/mqtt_adapter.cpp

@@ -85,12 +85,7 @@ namespace mtconnect {
       {
         m_options[configuration::MqttHost] = m_options[configuration::Host];
       }
-      if (!HasOption(m_options, configuration::MqttPort) &&
-          HasOption(m_options, configuration::Port))
-      {
-        m_options[configuration::MqttPort] = m_options[configuration::Port];
-      }
-      else
+      if (!HasOption(m_options, configuration::MqttPort))
       {
         m_options[configuration::MqttPort] = 1883;
       }
@@ -123,7 +118,7 @@ namespace mtconnect {
           !IsOptionSet(m_options, configuration::MqttWs))
       {
         m_client = make_shared<mtconnect::mqtt_client::MqttTlsClient>(m_ioContext, m_options,
-                                                                      move(clientHandler));
+                                                                      std::move(clientHandler));
       }
       else if (IsOptionSet(m_options, configuration::MqttWs) &&
                IsOptionSet(m_options, configuration::MqttTls))
@@ -139,7 +134,7 @@ namespace mtconnect {
       else
       {
         m_client = make_shared<mtconnect::mqtt_client::MqttTcpClient>(m_ioContext, m_options,
-                                                                      move(clientHandler));
+                                                                      std::move(clientHandler));
       }
 
       m_identity = m_client->getIdentity();