diff --git a/diagnostic_remote_logging/CMakeLists.txt b/diagnostic_remote_logging/CMakeLists.txt index 67a9f876..a33edea0 100644 --- a/diagnostic_remote_logging/CMakeLists.txt +++ b/diagnostic_remote_logging/CMakeLists.txt @@ -11,7 +11,7 @@ set(dependencies rclcpp_components diagnostic_msgs CURL - ) +) foreach(dep ${dependencies}) find_package(${dep} REQUIRED) @@ -21,9 +21,7 @@ include_directories( src/ include/ ) -add_library(influx_component SHARED - src/influxdb.cpp - ) +add_library(influx_component SHARED src/influxdb.cpp) ament_target_dependencies(influx_component ${dependencies}) @@ -51,6 +49,4 @@ if(BUILD_TESTING) target_link_libraries(unit_tests influx_component) ament_target_dependencies(unit_tests ${dependencies} ament_cmake_gtest) endif() - - ament_package() diff --git a/diagnostic_remote_logging/include/diagnostic_remote_logging/influx_line_protocol.hpp b/diagnostic_remote_logging/include/diagnostic_remote_logging/influx_line_protocol.hpp index d7d5aa22..fb6dcb59 100644 --- a/diagnostic_remote_logging/include/diagnostic_remote_logging/influx_line_protocol.hpp +++ b/diagnostic_remote_logging/include/diagnostic_remote_logging/influx_line_protocol.hpp @@ -139,13 +139,13 @@ void statusToInfluxLineProtocol(std::string& output, const diagnostic_msgs::msg: output += " " + timestamp_str + "\n"; } -std::string topLevelToInfluxLineProtocol(const diagnostic_msgs::msg::DiagnosticStatus::SharedPtr& msg, const rclcpp::Time& time) +std::string diagnosticStatusToInfluxLineProtocol(const diagnostic_msgs::msg::DiagnosticStatus::SharedPtr& msg, const rclcpp::Time& time) { std::string output = msg->name + " level=" + std::to_string(msg->level) + " " + toInfluxTimestamp(time) + "\n"; return output; }; -std::string arrayToInfluxLineProtocol(const diagnostic_msgs::msg::DiagnosticArray::SharedPtr& diag_msg) +std::string diagnosticArrayToInfluxLineProtocol(const diagnostic_msgs::msg::DiagnosticArray::SharedPtr& diag_msg) { std::string output; std::string timestamp = toInfluxTimestamp(diag_msg->header.stamp); diff --git a/diagnostic_remote_logging/package.xml b/diagnostic_remote_logging/package.xml index 02a1737b..164ca442 100644 --- a/diagnostic_remote_logging/package.xml +++ b/diagnostic_remote_logging/package.xml @@ -2,7 +2,7 @@ diagnostic_remote_logging - 0.0.1 + 4.3.1 diagnostic_remote_logging Daan Wijffels >BSD-3-Clause @@ -16,8 +16,6 @@ ament_lint_auto ament_lint_common ament_cmake_gtest - - ament_cmake diff --git a/diagnostic_remote_logging/src/influxdb.cpp b/diagnostic_remote_logging/src/influxdb.cpp index 9017171c..5d975dad 100644 --- a/diagnostic_remote_logging/src/influxdb.cpp +++ b/diagnostic_remote_logging/src/influxdb.cpp @@ -50,7 +50,7 @@ void InfluxDB::diagnosticsCallback(const diagnostic_msgs::msg::DiagnosticArray:: RCLCPP_ERROR(this->get_logger(), "Failed to send /diagnostics_agg to telegraf"); } - // RCLCPP_INFO(this->get_logger(), "%s", output.c_str()); + RCLCPP_DEBUG(this->get_logger(), "%s", output.c_str()); } void InfluxDB::topLevelCallback(const diagnostic_msgs::msg::DiagnosticStatus::SharedPtr msg) @@ -62,7 +62,7 @@ void InfluxDB::topLevelCallback(const diagnostic_msgs::msg::DiagnosticStatus::Sh RCLCPP_ERROR(this->get_logger(), "Failed to send /diagnostics_toplevel_state to telegraf"); } - // RCLCPP_INFO(this->get_logger(), "%s", output.c_str()); + RCLCPP_DEBUGRCLCPP_INFO(this->get_logger(), "%s", output.c_str()); } void InfluxDB::setupConnection(const std::string &url)