@@ -184,45 +184,47 @@ def _on_diagnostics(self, msg: DiagnosticArray):
184184 # Skip updating expected_frequencies if values aren't numeric
185185 self .expected_frequencies .pop (topic_name , None )
186186
187- def toggle_topic_monitoring (self , topic_name : str ):
187+ def toggle_topic_monitoring (self , topic_name : str ) -> tuple [ bool , str ] :
188188 """Toggle monitoring for a topic."""
189189 if not self .manage_topic_client .wait_for_service (timeout_sec = 1.0 ):
190- return
190+ return False , 'Could not connect to manage_topic service.'
191191
192192 request = ManageTopic .Request ()
193193 request .topic_name = topic_name
194194
195195 with self .data_lock :
196196 request .add_topic = topic_name not in self .ui_diagnostics
197197
198+ action = 'start' if request .add_topic else 'stop'
199+
198200 try :
199- # Use asynchronous service call to prevent deadlock
200201 future = self .manage_topic_client .call_async (request )
201202 rclpy .spin_until_future_complete (self .node , future , timeout_sec = 3.0 )
202203
203204 if future .result () is None :
204- action = 'start' if request .add_topic else 'stop'
205- self .node .get_logger ().error (
206- f'Failed to { action } monitoring: Service call timed out' )
207- return
205+ error_msg = f'Failed to { action } monitoring: Service call timed out'
206+ self .node .get_logger ().debug (error_msg )
207+ return False , error_msg
208208
209209 response = future .result ()
210210
211- with self .data_lock :
212- if not response .success :
213- action = 'start' if request .add_topic else 'stop'
214- self .node .get_logger ().error (
215- f'Failed to { action } monitoring: { response .message } ' )
216- return
211+ if not response .success :
212+ error_msg = f'Failed to { action } monitoring: { response .message } '
213+ self .node .get_logger ().debug (error_msg )
214+ return False , error_msg
217215
216+ with self .data_lock :
218217 if not request .add_topic and topic_name in self .ui_diagnostics :
219218 del self .ui_diagnostics [topic_name ]
220219 if topic_name in self .expected_frequencies :
221220 del self .expected_frequencies [topic_name ]
222221
222+ return True , f'Successfully { "started" if request .add_topic else "stopped" } monitoring'
223+
223224 except Exception as e :
224- action = 'start' if request .add_topic else 'stop'
225- self .node .get_logger ().error (f'Failed to { action } monitoring: { e } ' )
225+ error_msg = f'Failed to { action } monitoring: { e } '
226+ self .node .get_logger ().debug (error_msg )
227+ return False , error_msg
226228
227229 def set_expected_frequency (self ,
228230 topic_name : str ,
@@ -249,14 +251,14 @@ def set_expected_frequency(self,
249251 if future .result () is None :
250252 action = 'clear' if clear else 'set'
251253 error_msg = f'Failed to { action } expected frequency: Service call timed out'
252- self .node .get_logger ().error (error_msg )
254+ self .node .get_logger ().debug (error_msg )
253255 return False , error_msg
254256
255257 response = future .result ()
256258
257259 if not response .success :
258260 action = 'clear' if clear else 'set'
259- self .node .get_logger ().error (
261+ self .node .get_logger ().debug (
260262 f'Failed to { action } expected frequency: { response .message } ' )
261263 return False , response .message
262264 else :
@@ -269,7 +271,7 @@ def set_expected_frequency(self,
269271 except Exception as e :
270272 action = 'clear' if clear else 'set'
271273 error_msg = f'Failed to { action } expected frequency: { e } '
272- self .node .get_logger ().error (error_msg )
274+ self .node .get_logger ().debug (error_msg )
273275 return False , error_msg
274276
275277 def get_topic_diagnostics (self , topic_name : str ) -> UiDiagnosticData :
0 commit comments