Better connection failure handling

candlepin · Aug 16, 2016 · ff2419f · ff2419f
1 parent ee482b7
commit ff2419f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/virtwho/virt/esx/esx.py b/virtwho/virt/esx/esx.py
@@ -320,7 +320,6 @@ def login(self):
         try:
             self.client = suds.client.Client(wsdl, location="%s/sdk" % self.url, **kwargs)
         except requests.RequestException as e:
-            self.logger.exception("Unable to connect to ESX")
             raise virt.VirtError(str(e))
 
         self.client.set_options(timeout=self.MAX_WAIT_TIME)
@@ -333,7 +332,6 @@ def login(self):
         try:
             self.sc = self.client.service.RetrieveServiceContent(_this=self.moRef)
         except requests.RequestException as e:
-            self.logger.exception("Unable to connect to ESX")
             raise virt.VirtError(str(e))
 
         # Login to server using given credentials
@@ -342,6 +340,8 @@ def login(self):
             logging.getLogger('suds.client').setLevel(logging.CRITICAL)
             self.client.service.Login(_this=self.sc.sessionManager, userName=self.username, password=self.password)
             logging.getLogger('suds.client').setLevel(logging.ERROR)
+        except requests.RequestException as e:
+            raise virt.VirtError(str(e))
         except suds.WebFault as e:
             self.logger.exception("Unable to login to ESX")
             raise virt.VirtError(str(e))
@@ -375,7 +375,10 @@ def createFilter(self):
                                                    "config.network.dnsConfig.domainName"])
         ]
 
-        return self.client.service.CreateFilter(_this=self.sc.propertyCollector, spec=pfs, partialUpdates=0)
+        try:
+            return self.client.service.CreateFilter(_this=self.sc.propertyCollector, spec=pfs, partialUpdates=0)
+        except requests.RequestException as e:
+            raise virt.VirtError(str(e))
 
     def applyUpdates(self, updateSet):
         for filterSet in updateSet.filterSet:

diff --git a/virtwho/virt/xen/xen.py b/virtwho/virt/xen/xen.py
@@ -6,6 +6,7 @@
 from XenAPI import NewMaster, Failure
 from collections import defaultdict
 import logging
+import requests
 
 from virtwho import virt
 from virtwho.util import RequestsXmlrpcTransport
@@ -56,6 +57,8 @@ def login(self, url=None):
                 url = '%s://%s' % (self.url.partition(":")[0], url)
             self.logger.debug("Switching to new master: %s", url)
             return self.login(url)
+        except requests.ConnectionError as e:
+            raise virt.VirtError(str(e))
         except Exception as e:
             self.logger.exception("Unable to login to XENserver %s" % self.url)
             raise virt.VirtError(str(e))