Skip to content

Commit 1b1b1ae

Browse files
Juliajmergify[bot]
authored andcommitted
Revert temporary logging changes added for CI timeout investigation (#1741)
(cherry picked from commit e00d4cb)
1 parent 9683ad4 commit 1b1b1ae

File tree

2 files changed

+2
-37
lines changed

2 files changed

+2
-37
lines changed

force_torque_sensor_broadcaster/src/force_torque_sensor_broadcaster.cpp

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@ controller_interface::CallbackReturn ForceTorqueSensorBroadcaster::on_configure(
7676
{
7777
force_torque_sensor_ = std::make_unique<semantic_components::ForceTorqueSensor>(
7878
semantic_components::ForceTorqueSensor(params_.sensor_name));
79-
80-
// TODO(juliaj): remove the logging after resolving
81-
// https://github.com/ros-controls/ros2_controllers/issues/1574
82-
RCLCPP_INFO(
83-
get_node()->get_logger(), "Initialized force_torque_sensor with sensor name %s",
84-
params_.sensor_name.c_str());
8579
}
8680
else
8781
{
@@ -91,14 +85,6 @@ controller_interface::CallbackReturn ForceTorqueSensorBroadcaster::on_configure(
9185
semantic_components::ForceTorqueSensor(
9286
force_names.x, force_names.y, force_names.z, torque_names.x, torque_names.y,
9387
torque_names.z));
94-
95-
// TODO(juliaj): remove the logging after resolving
96-
// https://github.com/ros-controls/ros2_controllers/issues/1574
97-
RCLCPP_INFO(
98-
get_node()->get_logger(),
99-
"Initialized force_torque_sensor with interface names %s, %s, %s, %s, %s, %s",
100-
force_names.x.c_str(), force_names.y.c_str(), force_names.z.c_str(), torque_names.x.c_str(),
101-
torque_names.y.c_str(), torque_names.z.c_str());
10288
}
10389

10490
try
@@ -116,19 +102,11 @@ controller_interface::CallbackReturn ForceTorqueSensorBroadcaster::on_configure(
116102
return controller_interface::CallbackReturn::ERROR;
117103
}
118104

119-
// TODO(juliaj): remove the logging after resolving
120-
// https://github.com/ros-controls/ros2_controllers/issues/1574
121-
RCLCPP_INFO(get_node()->get_logger(), "Locking realtime publisher");
122105
realtime_publisher_->lock();
123-
RCLCPP_INFO(get_node()->get_logger(), "Locked realtime publisher");
124-
125106
realtime_publisher_->msg_.header.frame_id = params_.frame_id;
126-
127-
RCLCPP_INFO(get_node()->get_logger(), "Unlocking realtime publisher");
128107
realtime_publisher_->unlock();
129-
RCLCPP_INFO(get_node()->get_logger(), "Unlocked realtime publisher");
130108

131-
RCLCPP_INFO(get_node()->get_logger(), "Configure successful");
109+
RCLCPP_INFO(get_node()->get_logger(), "configure successful");
132110
return controller_interface::CallbackReturn::SUCCESS;
133111
}
134112

force_torque_sensor_broadcaster/test/test_force_torque_sensor_broadcaster.cpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,7 @@ void ForceTorqueSensorBroadcasterTest::SetUp()
4848
fts_broadcaster_ = std::make_unique<FriendForceTorqueSensorBroadcaster>();
4949
}
5050

51-
void ForceTorqueSensorBroadcasterTest::TearDown()
52-
{
53-
// TODO(juliaj): remove the logging after resolving
54-
// https://github.com/ros-controls/ros2_controllers/issues/1574
55-
RCLCPP_INFO(fts_broadcaster_->get_node()->get_logger(), "In TearDown");
56-
fts_broadcaster_.reset(nullptr);
57-
}
51+
void ForceTorqueSensorBroadcasterTest::TearDown() { fts_broadcaster_.reset(nullptr); }
5852

5953
void ForceTorqueSensorBroadcasterTest::SetUpFTSBroadcaster()
6054
{
@@ -72,9 +66,6 @@ void ForceTorqueSensorBroadcasterTest::SetUpFTSBroadcaster()
7266
state_ifs.emplace_back(fts_torque_z_);
7367

7468
fts_broadcaster_->assign_interfaces({}, std::move(state_ifs));
75-
// TODO(juliaj): remove the logging after resolving
76-
// https://github.com/ros-controls/ros2_controllers/issues/1574
77-
RCLCPP_INFO(fts_broadcaster_->get_node()->get_logger(), "FTSBroadcaster setup done");
7869
}
7970

8071
void ForceTorqueSensorBroadcasterTest::subscribe_and_get_message(
@@ -189,10 +180,6 @@ TEST_F(ForceTorqueSensorBroadcasterTest, InterfaceNames_Configure_Success)
189180
{
190181
SetUpFTSBroadcaster();
191182

192-
// TODO(juliaj): remove the logging after resolving
193-
// https://github.com/ros-controls/ros2_controllers/issues/1574
194-
RCLCPP_INFO(fts_broadcaster_->get_node()->get_logger(), "Setting up interface names");
195-
196183
// set the 'interface_names'
197184
fts_broadcaster_->get_node()->set_parameter({"interface_names.force.x", "fts_sensor/force.x"});
198185
fts_broadcaster_->get_node()->set_parameter({"interface_names.torque.z", "fts_sensor/torque.z"});

0 commit comments

Comments
 (0)