TMP: second attempt

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

Author: juanlofer-eprosima

ddsenabler/include/ddsenabler/DDSEnabler.hpp

@@ -42,6 +42,7 @@
 #include <ddsenabler_yaml/EnablerConfiguration.hpp>
 
 #include <ddsenabler/CallbackSet.hpp>
+#include <ddsenabler/library/library_dll.h>
 
 namespace eprosima {
 namespace ddsenabler {
@@ -61,6 +62,7 @@ class DDSEnabler
      * @param configuration: Structure encapsulating all enabler configuration options.
      * @param callbacks: Set of callbacks to be used by the enabler.
      */
+    DDSENABLER_DllAPI
     DDSEnabler(
             const yaml::EnablerConfiguration& configuration,
             const CallbackSet& callbacks);
@@ -72,6 +74,7 @@ class DDSEnabler
      *
      * @return \c true if operation was succesful, \c false otherwise.
      */
+    DDSENABLER_DllAPI
     bool set_file_watcher(
             const std::string& file_path);
 
@@ -84,6 +87,7 @@ class DDSEnabler
      * @return \c RETCODE_NO_DATA if new allowed topics list is the same as the previous one
      * @return \c RETCODE_ERROR if any other error has occurred.
      */
+    DDSENABLER_DllAPI
     utils::ReturnCode reload_configuration(
             yaml::EnablerConfiguration& new_configuration);
 
@@ -94,6 +98,7 @@ class DDSEnabler
      * @param json: The JSON message to publish.
      * @return \c true if the message was published successfully, \c false otherwise.
      */
+    DDSENABLER_DllAPI
     bool publish(
             const std::string& topic_name,
             const std::string& json);

ddsenabler/include/ddsenabler/dds_enabler_runner.hpp

@@ -19,33 +19,38 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-
-#include <cpp_utils/event/FileWatcherHandler.hpp>
-#include <cpp_utils/event/PeriodicEventHandler.hpp>
-#include <cpp_utils/exception/ConfigurationException.hpp>
-#include <cpp_utils/exception/InitializationException.hpp>
-#include <cpp_utils/logging/BaseLogConfiguration.hpp>
-#include <cpp_utils/logging/StdLogConsumer.hpp>
-#include <cpp_utils/ReturnCode.hpp>
-#include <cpp_utils/time/time_utils.hpp>
-
-#include <ddspipe_core/logging/DdsLogConsumer.hpp>
-
 #include <ddsenabler_yaml/EnablerConfiguration.hpp>
 
 #include <ddsenabler/CallbackSet.hpp>
 #include <ddsenabler/DDSEnabler.hpp>
 
+#include <ddsenabler/library/library_dll.h>
+
 namespace eprosima {
 namespace ddsenabler {
 
+/**
+ * @brief Create a DDS Enabler instance from a configuration file path.
+ *
+ * @param configuration_path Path to the configuration file.
+ * @param callbacks Set of callbacks to be used by the DDS Enabler.
+ * @param enabler Output parameter to hold the created DDS Enabler instance.
+ * @return true if the DDS Enabler was created successfully, false otherwise.
+ */
+DDSENABLER_DllAPI
 bool create_dds_enabler(
-        const char* ddsEnablerConfigFile,
+        const char* configuration_path,
         const CallbackSet& callbacks,
         std::shared_ptr<DDSEnabler>& enabler);
-
+/**
+ * @brief Create a DDS Enabler instance from a configuration object.
+ *
+ * @param configuration DDS Enabler configuration object.
+ * @param callbacks Set of callbacks to be used by the DDS Enabler.
+ * @param enabler Output parameter to hold the created DDS Enabler instance.
+ * @return true if the DDS Enabler was created successfully, false otherwise.
+ */
+DDSENABLER_DllAPI
 bool create_dds_enabler(
         yaml::EnablerConfiguration configuration,
         const CallbackSet& callbacks,

ddsenabler/src/cpp/dds_enabler_runner.cpp

@@ -19,9 +19,13 @@
 
 #include <string>
 
+#include <cpp_utils/exception/ConfigurationException.hpp>
+#include <cpp_utils/exception/InitializationException.hpp>
 #include <cpp_utils/Log.hpp>
 #include <cpp_utils/logging/StdLogConsumer.hpp>
 
+#include <ddspipe_core/logging/DdsLogConsumer.hpp>
+
 #include <ddsenabler_participants/DDSEnablerLogConsumer.hpp>
 
 #include <ddsenabler/dds_enabler_runner.hpp>
@@ -32,35 +36,44 @@ namespace eprosima {
 namespace ddsenabler {
 
 bool create_dds_enabler(
-        const char* ddsEnablerConfigFile,
+        const char* configuration_path,
         const CallbackSet& callbacks,
         std::shared_ptr<DDSEnabler>& enabler)
 {
     std::string dds_enabler_config_file = "";
-    if (ddsEnablerConfigFile != NULL)
+    if (configuration_path != NULL)
     {
-        dds_enabler_config_file = ddsEnablerConfigFile;
+        dds_enabler_config_file = configuration_path;
     }
 
-    // Load configuration from file
-    eprosima::ddsenabler::yaml::EnablerConfiguration configuration(dds_enabler_config_file);
-
-    // Create DDS Enabler instance
-    if (!create_dds_enabler(
-                configuration,
-                callbacks,
-                enabler))
+    try
     {
-        EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION,
-                "Failed to create DDS Enabler from configuration file: " << dds_enabler_config_file);
-        return false;
-    }
+        // Load configuration from file
+        eprosima::ddsenabler::yaml::EnablerConfiguration configuration(dds_enabler_config_file);
+
+        // Create DDS Enabler instance
+        if (!create_dds_enabler(
+                    configuration,
+                    callbacks,
+                    enabler))
+        {
+            EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION,
+                    "Failed to create DDS Enabler from configuration file: " << dds_enabler_config_file);
+            return false;
+        }
 
-    // Set the file watcher to reload the configuration if the file changes
-    if (!enabler->set_file_watcher(dds_enabler_config_file))
+        // Set the file watcher to reload the configuration if the file changes
+        if (!enabler->set_file_watcher(dds_enabler_config_file))
+        {
+            EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION,
+                    "Failed to set file watcher.");
+            return false;
+        }
+    }
+    catch (const eprosima::utils::ConfigurationException& e)
     {
         EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION,
-                "Failed to set file watcher.");
+                "Error Loading DDS Enabler Configuration. Error message:\n " << e.what());
         return false;
     }
 
@@ -79,8 +92,9 @@ bool create_dds_enabler(
         eprosima::utils::Formatter error_msg;
         if (!configuration.is_valid(error_msg))
         {
-            throw eprosima::utils::ConfigurationException(
-                      eprosima::utils::Formatter() << "Invalid configuration: " << error_msg);
+            EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION,
+                    "Invalid configuration: " << error_msg);
+            return false;
         }
 
         // Logging