Merge pull request #464 from mtconnect/460_461_mqtt_adapter_issues

Improved host and port handling in MQTT adapter. Fixed options in the…

CMakeLists.txt

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

src/mtconnect/configuration/agent_config.cpp

@@ -950,10 +950,16 @@ namespace mtconnect::configuration {
         ConfigOptions adapterOptions = options;
 
         GetOptions(block.second, adapterOptions, options);
+        // Erase the host and port so they can be properly defaulted.
+        adapterOptions.erase(configuration::Host);
+        adapterOptions.erase(configuration::Port);
+
         AddOptions(block.second, adapterOptions,
                    {{configuration::Url, string()},
                     {configuration::Device, string()},
                     {configuration::UUID, string()},
+                    {configuration::Host, string()},
+                    {configuration::Port, int32_t()},
                     {configuration::Heartbeat, std::chrono::milliseconds()},
                     {configuration::Uuid, string()}});
 

src/mtconnect/source/adapter/adapter_pipeline.hpp

@@ -82,9 +82,9 @@ namespace mtconnect::source::adapter {
     void buildObservationDelivery(pipeline::TransformPtr next);
 
   protected:
-    ConfigOptions m_options;
     StringList m_devices;
     std::optional<std::string> m_device;
     std::string m_identity;
+    ConfigOptions m_options;
   };
 }  // namespace mtconnect::source::adapter

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

@@ -85,7 +85,13 @@ namespace mtconnect {
       {
         m_options[configuration::MqttHost] = m_options[configuration::Host];
       }
-      if (!HasOption(m_options, configuration::MqttPort))
+
+      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;
       }

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

@@ -42,9 +42,6 @@ namespace mtconnect::source::adapter::mqtt_adapter {
 
     void build(const ConfigOptions &options) override;
     Handler *m_handler {nullptr};
-
-  protected:
-    ConfigOptions m_options;
   };
 
   /// @brief An Mqtt adapter to connnect to another Agent and replicate data