openstack/oslo.service
Code Issues Proposed changes

Check that sighup is supported before accessing signal.SIGHUP

Browse Source 
Use string representations of signals when adding a handler to
avoid AttribureError in case a signal is not supported on a
certain platform.
Fixed a check for sighup support in add_handler method.
Added the add_handlers method that allows to add several handlers
at once and remove this functionality from add_handler to prevent
recursive calls in case we pass a tuple of strings.

Change-Id: Id3783160381f4a89e241134ef13c4521a30dfa94
Closes-Bug: #1481607
This commit is contained in:
Elena Ezhova 2015-08-05 12:51:36 +03:00
parent ab3c3401ce
commit d7c0966df3
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
oslo_service/service.py
View File

@ -121,6 +121,7 @@ class Singleton(type):
@six.add_metaclass(Singleton)
class SignalHandler(object):
def __init__(self, *args, **kwargs):
super(SignalHandler, self).__init__(*args, **kwargs)
# Map all signal names to signal integer values and create a
@ -142,16 +143,16 @@ class SignalHandler(object):
signal.signal(sig, signal.SIG_DFL)
self._signal_handlers.clear()
def add_handler(self, signals, handler):
if isinstance(signals, collections.Iterable):
for sig in signals:
self.add_handler(sig, handler)
def add_handlers(self, signals, handler):
for sig in signals:
self.add_handler(sig, handler)
def add_handler(self, sig, handler):
if sig == "SIGHUP" and not self.is_sighup_supported:
return
sig = signals
if sig == signal.SIGHUP and not self.is_sighup_supported:
return
self._signal_handlers[sig].add(handler)
signal.signal(sig, self._handle_signals)
signo = self._signals_by_name[sig]
self._signal_handlers[signo].add(handler)
signal.signal(signo, self._handle_signals)
def _handle_signals(self, signo, frame):
for handler in self._signal_handlers[signo]:
@ -239,8 +240,8 @@ class ServiceLauncher(Launcher):
def handle_signal(self):
"""Set self._handle_signal as a signal handler."""
SignalHandler().add_handler(
(signal.SIGTERM, signal.SIGHUP, signal.SIGINT),
SignalHandler().add_handlers(
('SIGTERM', 'SIGHUP', 'SIGINT'),
self._handle_signal)
def _wait_for_exit_or_signal(self, ready_callback=None):
@ -314,9 +315,9 @@ class ProcessLauncher(object):
def handle_signal(self):
"""Add instance's signal handlers to class handlers."""
self.signal_handler.add_handler((signal.SIGTERM, signal.SIGHUP),
self._handle_signal)
self.signal_handler.add_handler(signal.SIGINT, self._fast_exit)
self.signal_handler.add_handlers(('SIGTERM', 'SIGHUP'),
self._handle_signal)
self.signal_handler.add_handler('SIGINT', self._fast_exit)
def _handle_signal(self, signo, frame):
"""Set signal handlers.
@ -360,9 +361,9 @@ class ProcessLauncher(object):
self.signal_handler.clear()
# Parent signals with SIGTERM when it wants us to go away.
self.signal_handler.add_handler(signal.SIGTERM, _sigterm)
self.signal_handler.add_handler(signal.SIGHUP, _sighup)
self.signal_handler.add_handler(signal.SIGINT, self._fast_exit)
self.signal_handler.add_handler('SIGTERM', _sigterm)
self.signal_handler.add_handler('SIGHUP', _sighup)
self.signal_handler.add_handler('SIGINT', self._fast_exit)
def _child_wait_for_exit_or_signal(self, launcher):
status = 0

4
oslo_service/tests/test_service.py
View File

@ -376,8 +376,8 @@ class ProcessLauncherTest(base.ServiceBaseTestCase):
self.assertEqual(0,
len(signal_handler._signal_handlers[signal.SIGTERM]))
call_1, call_2 = mock.Mock(), mock.Mock()
signal_handler.add_handler(signal.SIGTERM, call_1)
signal_handler.add_handler(signal.SIGTERM, call_2)
signal_handler.add_handler('SIGTERM', call_1)
signal_handler.add_handler('SIGTERM', call_2)
self.assertEqual(2,
len(signal_handler._signal_handlers[signal.SIGTERM]))
signal_handler._handle_signals(signal.SIGTERM, 'test')