summaryrefslogtreecommitdiff
path: root/py/python/Ice.py
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2007-01-04 19:46:29 +0000
committerMatthew Newhook <matthew@zeroc.com>2007-01-04 19:46:29 +0000
commitfd37a64453ec49643aefd84ad7b0ca1f87628992 (patch)
tree5d26268eef81f1f2eae57b5ddc728a40347d48c8 /py/python/Ice.py
parentThe user callback is now always called in the of a SIGHUP. (diff)
downloadice-fd37a64453ec49643aefd84ad7b0ca1f87628992.tar.bz2
ice-fd37a64453ec49643aefd84ad7b0ca1f87628992.tar.xz
ice-fd37a64453ec49643aefd84ad7b0ca1f87628992.zip
The user callback is always called in the case of a SIGHUP.
Diffstat (limited to 'py/python/Ice.py')
-rw-r--r--py/python/Ice.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/py/python/Ice.py b/py/python/Ice.py
index ade36301d54..babc154c7e5 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -858,12 +858,14 @@ class Application(object):
def userCallbackOnInterruptCallback(self, sig):
self._condVar.acquire()
- if self._destroyed or self._nohup and sig == signal.SIGHUP:
+ if self._destroyed:
#
- # Being destroyed by main thread, or nohup.
+ # Being destroyed by main thread.
#
self._condVar.release()
return
+ # For SIGHUP the user callback is always called. It can decide
+ # what to do.
self._callbackInProcess = True
self._interrupted = True