cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "centralized TERM signal handling"

Browse source 
This reverts commit 5a88478ccc.
is WIP, not ready for use yet
This commit is contained in:
Brian Coca 2016-02-10 09:48:22 -05:00
parent 2adddac94c
commit d9dcb2a427
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/cli/__init__.py
View file

@ -27,7 +27,6 @@ import time
import yaml import yaml
import re import re
import getpass import getpass
import signal
import subprocess import subprocess
from ansible import __version__ from ansible import __version__
@ -78,11 +77,6 @@ class CLI(object):
self.action = None self.action = None
self.callback = callback self.callback = callback
def _terminate(self, signum=None, framenum=None):
if signum is not None:
display.debug("Termination signal detected, shutting down gracefully: %d" % os.getpid() )
raise SystemExit
def set_action(self): def set_action(self):
""" """
Get the action the user wants to execute from the sys argv list. Get the action the user wants to execute from the sys argv list.
@ -115,9 +109,6 @@ class CLI(object):
else: else:
display.display(u"No config file found; using defaults") display.display(u"No config file found; using defaults")
# Manage user interruptions
signal.signal(signal.SIGTERM, self._terminate)
@staticmethod @staticmethod
def ask_vault_passwords(ask_new_vault_pass=False, rekey=False): def ask_vault_passwords(ask_new_vault_pass=False, rekey=False):
''' prompt for vault password and/or password change ''' ''' prompt for vault password and/or password change '''

8
lib/ansible/cli/adhoc.py
View file

@ -21,6 +21,7 @@ __metaclass__ = type
######################################################## ########################################################
import os import os
import signal
from ansible import constants as C from ansible import constants as C
from ansible.cli import CLI from ansible.cli import CLI
@ -88,6 +89,10 @@ class AdHocCLI(CLI):
tasks = [ dict(action=dict(module=self.options.module_name, args=parse_kv(self.options.module_args)), async=async, poll=poll) ] tasks = [ dict(action=dict(module=self.options.module_name, args=parse_kv(self.options.module_args)), async=async, poll=poll) ]
) )
def _terminate(self, signum=None, framenum=None):
if signum is not None:
display.debug("Termination signal detected, shutting down gracefully")
raise SystemExit
def run(self): def run(self):
''' use Runner lib to do SSH things ''' ''' use Runner lib to do SSH things '''
@ -171,6 +176,9 @@ class AdHocCLI(CLI):
# now create a task queue manager to execute the play # now create a task queue manager to execute the play
self._tqm = None self._tqm = None
try: try:
# Manage user interruptions
signal.signal(signal.SIGTERM, self._terminate)
self._tqm = TaskQueueManager( self._tqm = TaskQueueManager(
inventory=inventory, inventory=inventory,
variable_manager=variable_manager, variable_manager=variable_manager,

7
lib/ansible/executor/playbook_executor.py
View file

@ -22,6 +22,7 @@ __metaclass__ = type
import getpass import getpass
import locale import locale
import os import os
import signal
import sys import sys
from ansible.compat.six import string_types from ansible.compat.six import string_types
@ -68,6 +69,8 @@ class PlaybookExecutor:
may limit the runs to serialized groups, etc. may limit the runs to serialized groups, etc.
''' '''
signal.signal(signal.SIGTERM, self._terminate)
result = 0 result = 0
entrylist = [] entrylist = []
entry = {} entry = {}
@ -204,6 +207,10 @@ class PlaybookExecutor:
return result return result
def _terminate(self, signum=None, framenum=None):
display.debug("Termination signal detected, shutting down gracefully")
raise SystemExit
def _get_serialized_batches(self, play): def _get_serialized_batches(self, play):
''' '''
Returns a list of hosts, subdivided into batches based on Returns a list of hosts, subdivided into batches based on