diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-21 10:20:19 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-21 10:20:19 -0400 |
| commit | fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c (patch) | |
| tree | 5bed1930ce1edac533317749daba26680934f640 /src/lib/Bcfg2/Server/SSLServer.py | |
| parent | 29f98cdba4d7babc9fa8c0d479059060edc9aa2b (diff) | |
| parent | 1690cf04ca2b63f8312670dc6f9067fae5c8cd73 (diff) | |
| download | bcfg2-fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c.tar.gz bcfg2-fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c.tar.bz2 bcfg2-fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c.zip | |
Merge branch 'maint'
Diffstat (limited to 'src/lib/Bcfg2/Server/SSLServer.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/SSLServer.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/SSLServer.py b/src/lib/Bcfg2/Server/SSLServer.py index eea2183f7..8bdcf0500 100644 --- a/src/lib/Bcfg2/Server/SSLServer.py +++ b/src/lib/Bcfg2/Server/SSLServer.py @@ -290,7 +290,10 @@ class XMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): raise except socket.error: err = sys.exc_info()[1] - if err[0] == 32: + if isinstance(err, socket.timeout): + self.logger.warning("Connection timed out for %s" % + self.client_address[0]) + elif err[0] == 32: self.logger.warning("Connection dropped from %s" % self.client_address[0]) elif err[0] == 104: @@ -423,7 +426,9 @@ class XMLRPCServer(SocketServer.ThreadingMixIn, SSLServer, def serve_forever(self): """Serve single requests until (self.serve == False).""" self.serve = True - self.task_thread = threading.Thread(target=self._tasks_thread) + self.task_thread = \ + threading.Thread(name="%sThread" % self.__class__.__name__, + target=self._tasks_thread) self.task_thread.start() self.logger.info("serve_forever() [start]") signal.signal(signal.SIGINT, self._handle_shutdown_signal) |