IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 08:00:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add debug logging for keep-alive

Browse Source 
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
This commit is contained in:
Christian Heimes 2017-03-20 08:47:51 +01:00 committed by Tomas Krizek
parent 7beb6d1cad
commit b2bdd2e1a9
No known key found for this signature in database
GPG Key ID: 22A2A94B5E49415A
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ipalib/rpc.py
View File

@ -79,6 +79,13 @@ except ImportError:
from xmlrpc.client import (Binary, Fault, DateTime, dumps, loads, ServerProxy,
Transport, ProtocolError, MININT, MAXINT)
# pylint: disable=import-error
if six.PY3:
from http.client import RemoteDisconnected
else:
from httplib import BadStatusLine as RemoteDisconnected
# pylint: enable=import-error
if six.PY3:
unicode = str
@ -531,6 +538,7 @@ class SSLTransport(LanguageAwareTransport):
host, self._extra_headers, _x509 = self.get_host_info(host)
if self._connection and host == self._connection[0]:
root_logger.debug("HTTP connection keep-alive (%s)", host)
return self._connection[1]
conn = create_https_connection(
@ -540,6 +548,7 @@ class SSLTransport(LanguageAwareTransport):
tls_version_max=api.env.tls_version_max)
conn.connect()
root_logger.debug("New HTTP connection (%s)", host)
self._connection = host, conn
return self._connection[1]
@ -686,8 +695,18 @@ class KerbTransport(SSLTransport):
return self.parse_response(response)
except gssapi.exceptions.GSSError as e:
self._handle_exception(e)
except BaseException:
except RemoteDisconnected:
# keep-alive connection was terminated by remote peer, close
# connection and let transport handle reconnect for us.
self.close()
root_logger.debug("HTTP server has closed connection (%s)", host)
raise
except BaseException as e:
# Unexpected exception may leave connections in a bad state.
self.close()
root_logger.debug("HTTP connection destroyed (%s)",
host, exc_info=True)
raise
if six.PY3:
def __send_request(self, connection, host, handler, request_body, debug):