diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Proxy.py | 3 | ||||
| -rw-r--r-- | src/lib/SSLServer.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/Proxy.py b/src/lib/Proxy.py index bb53a24af..b7801a03c 100644 --- a/src/lib/Proxy.py +++ b/src/lib/Proxy.py @@ -73,6 +73,9 @@ class RetryMethod(xmlrpclib._Method): if hasattr(err, 'errno') and err.errno == 336265218: self.log.error("SSL Key error") break + if hasattr(err, 'errno') and err.errno == 185090050: + self.log.error("SSL CA error") + break if retry == 3: self.log.error("Server failure: %s" % err) raise xmlrpclib.Fault(20, err) diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py index 6d053b802..32ab9933b 100644 --- a/src/lib/SSLServer.py +++ b/src/lib/SSLServer.py @@ -16,6 +16,7 @@ import logging import ssl import threading import time +import types # Compatibility imports from Bcfg2.Bcfg2Py3k import xmlrpclib, SimpleXMLRPCServer, SocketServer @@ -47,7 +48,7 @@ class XMLRPCDispatcher (SimpleXMLRPCServer.SimpleXMLRPCDispatcher): params = (address, ) + params response = self.instance._dispatch(method, params, self.funcs) # py3k compatibility - if type(response) not in [bool, str, list, dict]: + if type(response) not in [bool, str, list, dict, types.NoneType]: response = (response.decode('utf-8'), ) else: response = (response, ) |