Skip to content

Commit 06cf662

Browse files
committed
synchronize_channel fixed
1 parent 89619f3 commit 06cf662

File tree

3 files changed

+105
-134
lines changed

3 files changed

+105
-134
lines changed

mocha_core/mocha_core/synchronize_channel.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,21 +407,21 @@ def stop(self):
407407
self.sm_shutdown.set()
408408
# This terminates the comm node, so we can wait for the thread to finish
409409
self.th.join()
410-
self.logger.warn(f"Channel {self.this_robot} -> {self.target_robot} destroyed")
410+
self.logger.info(f"Channel {self.this_robot} -> {self.target_robot} destroyed")
411411

412412

413413
def sm_thread(self):
414414
# Start the state machine and wait until it ends
415-
self.logger.warn(f"Channel {self.this_robot} -> {self.target_robot} started")
415+
self.logger.info(f"Channel {self.this_robot} -> {self.target_robot} started")
416416
outcome = self.sm.execute()
417+
# Terminate the comm node once the state machine ends
418+
self.comm_node.terminate()
417419
exit_msg = f"Channel {self.this_robot} -> {self.target_robot}" + \
418420
f" finished with outcome: {outcome}"
419421
if outcome == 'failure':
420422
self.logger.error(exit_msg)
421423
elif outcome == 'stopped':
422-
self.logger.warn(exit_msg)
423-
# Terminate the comm node once the state machine ends
424-
self.comm_node.terminate()
424+
self.logger.info(exit_msg)
425425

426426
def get_comm_node(self):
427427
if not self.comm_node:
@@ -431,7 +431,7 @@ def get_comm_node(self):
431431

432432
def trigger_sync(self):
433433
if self.sync.get_state():
434-
self.logger.warn(f"{self.this_robot} <- {self.target_robot}: Channel Busy")
434+
self.logger.warn(f"{self.this_robot} <- {self.target_robot}: Channel busy")
435435
else:
436436
self.sync.set()
437437

mocha_core/mocha_core/zmq_comm_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,4 +234,4 @@ def server_thread(self):
234234
def terminate(self):
235235
self.server_running.clear()
236236
self.th.join()
237-
self.logger.warn(f"Node {self.this_node} <- {self.client_node} - Terminating server")
237+
self.logger.info(f"Node {self.this_node} -> {self.client_node} terminating server")

0 commit comments

Comments
 (0)