From 1b8dec9c886ba3584ef31ad798133b7114a8583d Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 9 Feb 2016 18:10:36 -0500 Subject: [PATCH] avoid termination message when term is internal --- lib/ansible/cli/adhoc.py | 3 ++- lib/ansible/executor/playbook_executor.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/ansible/cli/adhoc.py b/lib/ansible/cli/adhoc.py index faacd6c67bb..4cba2be16ca 100644 --- a/lib/ansible/cli/adhoc.py +++ b/lib/ansible/cli/adhoc.py @@ -91,7 +91,8 @@ class AdHocCLI(CLI): def _terminate(self, signum=None, framenum=None): if signum is not None: - raise SystemExit("Interrupt detected, shutting down gracefully") + display.debug("Termination signal detected, shutting down gracefully") + raise SystemExit def run(self): ''' use Runner lib to do SSH things ''' diff --git a/lib/ansible/executor/playbook_executor.py b/lib/ansible/executor/playbook_executor.py index c1a1303a9c7..83449f14352 100644 --- a/lib/ansible/executor/playbook_executor.py +++ b/lib/ansible/executor/playbook_executor.py @@ -208,8 +208,8 @@ class PlaybookExecutor: return result def _terminate(self, signum=None, framenum=None): - display.debug(framenum) - raise SystemExit("Terminating run due to external signal") + display.debug("Termination signal detected, shutting down gracefully") + raise SystemExit def _get_serialized_batches(self, play): '''