diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2009-05-06 01:27:17 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2009-05-06 01:27:17 +0000 |
commit | b7019744fa1ca11b6ecbb968e1292da496029e01 (patch) | |
tree | 2dfb64d218b0a1fca3995792880326343b2013b0 /src/lib/SSLServer.py | |
parent | f848924fae9fb16ac8f4df2c0c8ac53127f584a5 (diff) | |
download | bcfg2-b7019744fa1ca11b6ecbb968e1292da496029e01.tar.gz bcfg2-b7019744fa1ca11b6ecbb968e1292da496029e01.tar.bz2 bcfg2-b7019744fa1ca11b6ecbb968e1292da496029e01.zip |
SSL Server: handle ctrl-c properly
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5191 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/SSLServer.py')
-rw-r--r-- | src/lib/SSLServer.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py index b9ab81f81..a747c83a1 100644 --- a/src/lib/SSLServer.py +++ b/src/lib/SSLServer.py @@ -12,6 +12,7 @@ import socket import SocketServer import SimpleXMLRPCServer import base64 +import select import signal import logging import ssl @@ -303,6 +304,8 @@ class XMLRPCServer (SocketServer.ThreadingMixIn, SSLServer, self.handle_request() except socket.timeout: pass + except select.error: + pass except: self.logger.error("Got unexpected error in handle_request", exc_info=1) |