handle all socket errors (socket-related/address-related and timeout related)

diff --git a/certmaster/utils.py b/certmaster/utils.py
index 1bf931e..968d697 100644 (file)
--- a/certmaster/utils.py
+++ b/certmaster/utils.py
@@ -172,7 +172,7 @@ def create_minion_keys(hostname=None):
             # print "DEBUG: submitting CSR to certmaster: %s" % master_uri
             log.debug("submitting CSR: %s  to certmaster %s" % (csr_file, master_uri))
             result, cert_string, ca_cert_string = submit_csr_to_master(csr_file, master_uri)
-        except socket.gaierror, e:
+        except socket.error, e:
             log.warning("Could not locate certmaster at %s" % master_uri)
 
         # logging here would be nice