| Message ID | 1468592469-10160-3-git-send-email-pboca@cloudbasesolutions.com |
|---|---|
| State | Superseded |
| Delegated to: | Guru Shetty |
| Headers | show |
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> > -----Mesaj original----- > De la: dev [mailto:dev-bounces@openvswitch.org] În numele Paul Boca > Trimis: Friday, July 15, 2016 5:21 PM > Către: dev@openvswitch.org > Subiect: [ovs-dev] [PATCH V7 02/16] python tests: Register signal handlers > only on supported types on Windows > > SIGHUP and SIGALRM are not available on Windows. > > Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com> > --- > V2: Fixed Python function inet_open_active, treat WSAEWOULDBLOCK error > as > EINPROGRESS on Windows > V3: No changes > V4: No changes > V5: No changes > V6: No changes > V7: Simplified the signal handlers code > --- > python/ovs/fatal_signal.py | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/python/ovs/fatal_signal.py b/python/ovs/fatal_signal.py index > 14605ac..73e4be6 100644 > --- a/python/ovs/fatal_signal.py > +++ b/python/ovs/fatal_signal.py > @@ -16,6 +16,7 @@ import atexit > import os > import signal > import sys > + > import ovs.vlog > > _hooks = [] > @@ -128,9 +129,13 @@ def _init(): > global _inited > if not _inited: > _inited = True > + if sys.platform == "win32": > + signals = [signal.SIGTERM, signal.SIGINT] > + else: > + signals = [signal.SIGTERM, signal.SIGINT, signal.SIGHUP, > + signal.SIGALRM] > > - for signr in (signal.SIGTERM, signal.SIGINT, > - signal.SIGHUP, signal.SIGALRM): > + for signr in signals: > if signal.getsignal(signr) == signal.SIG_DFL: > signal.signal(signr, _signal_handler) > atexit.register(_atexit_handler) > -- > 2.7.2.windows.1 > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
diff --git a/python/ovs/fatal_signal.py b/python/ovs/fatal_signal.py index 14605ac..73e4be6 100644 --- a/python/ovs/fatal_signal.py +++ b/python/ovs/fatal_signal.py @@ -16,6 +16,7 @@ import atexit import os import signal import sys + import ovs.vlog _hooks = [] @@ -128,9 +129,13 @@ def _init(): global _inited if not _inited: _inited = True + if sys.platform == "win32": + signals = [signal.SIGTERM, signal.SIGINT] + else: + signals = [signal.SIGTERM, signal.SIGINT, signal.SIGHUP, + signal.SIGALRM] - for signr in (signal.SIGTERM, signal.SIGINT, - signal.SIGHUP, signal.SIGALRM): + for signr in signals: if signal.getsignal(signr) == signal.SIG_DFL: signal.signal(signr, _signal_handler) atexit.register(_atexit_handler)
SIGHUP and SIGALRM are not available on Windows. Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com> --- V2: Fixed Python function inet_open_active, treat WSAEWOULDBLOCK error as EINPROGRESS on Windows V3: No changes V4: No changes V5: No changes V6: No changes V7: Simplified the signal handlers code --- python/ovs/fatal_signal.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)