catch ExternalShutdownException ros2cli main. (#854)

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
ros2 · Oct 1, 2023 · 0084d12 · 0084d12
1 parent 2a25342
commit 0084d12
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/ros2cli/ros2cli/cli.py b/ros2cli/ros2cli/cli.py
@@ -19,6 +19,8 @@
 import signal
 import sys
 
+from rclpy.executors import ExternalShutdownException
+
 from ros2cli.command import add_subparsers_on_demand
 
 
@@ -89,6 +91,8 @@ def main(*, script_name='ros2', argv=None, description=None, extension=None):
         rc = extension.main(parser=parser, args=args)
     except KeyboardInterrupt:
         rc = signal.SIGINT
+    except ExternalShutdownException:
+        rc = signal.SIGTERM
     except RuntimeError as e:
         rc = str(e)
     return rc