wrong return value fixed for mon_monitoring_json

eclipse-ecal · Aug 8, 2024 · 655c608 · 655c608
1 parent 304b5f9
commit 655c608
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/ecal/core/include/ecal/ecal_monitoring.h b/ecal/core/include/ecal/ecal_monitoring.h
@@ -91,7 +91,6 @@ namespace eCAL
      * @return Number of struct elements if succeeded.
     **/
     ECAL_API int GetMonitoring(eCAL::Monitoring::SMonitoring& mon_, unsigned int entities_ = Entity::All);
-
 
     /**
      * @brief Get monitoring subset as JSON string.

diff --git a/ecal/core/src/monitoring/ecal_monitoring_def.cpp b/ecal/core/src/monitoring/ecal_monitoring_def.cpp
@@ -130,7 +130,7 @@ namespace eCAL
       return(0);
     }
 
-    ECAL_API int GetMonitoringJSON(std::string& mon_, unsigned int entities_)
+    int GetMonitoringJSON(std::string& mon_, unsigned int entities_)
     {
       if (g_monitoring() != nullptr) g_monitoring()->GetMonitoringJSON(mon_, entities_);
       return((int)mon_.size());

diff --git a/lang/python/core/src/ecal_wrap.cxx b/lang/python/core/src/ecal_wrap.cxx
@@ -1532,7 +1532,7 @@ PyObject* mon_monitoring_json(PyObject* /*self*/, PyObject* /*args*/)
 {
   std::string monitoring_s;
   eCAL::Monitoring::GetMonitoringJSON(monitoring_s);
-  return(Py_BuildValue("s", ecal_getversion()));
+  return(Py_BuildValue("s", monitoring_s.c_str()));
 }
 
 /****************************************/
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,7 +91,6 @@ namespace eCAL @@
          * @return Number of struct elements if succeeded.
         **/
         ECAL_API int GetMonitoring(eCAL::Monitoring::SMonitoring& mon_, unsigned int entities_ = Entity::All);
         /**
          * @brief Get monitoring subset as JSON string.
@@ Expand Down @@