catch exceptions from ServerInfo

tableauserverclient/models/server_info_item.py

@@ -1,3 +1,4 @@
+import logging
 import warnings
 import xml
 
@@ -35,11 +36,18 @@ def rest_api_version(self):
 
     @classmethod
     def from_response(cls, resp, ns):
+        logger = logging.getLogger("TSC.ServerInfo")
         try:
             parsed_response = fromstring(resp)
         except xml.etree.ElementTree.ParseError as error:
-            print("Unexpected response for ServerInfo: {}".format(resp))
+            logger.info("Unexpected response for ServerInfo: {}".format(resp))
+            logger.info(error)
             return cls("Unknown", "Unknown", "Unknown")
+        except Exception as error:
+            logger.info("Unexpected response for ServerInfo: {}".format(resp))
+            logger.info(error)
+            return cls("Unknown", "Unknown", "Unknown")
+
         product_version_tag = parsed_response.find(".//t:productVersion", namespaces=ns)
         rest_api_version_tag = parsed_response.find(".//t:restApiVersion", namespaces=ns)
 

tableauserverclient/server/endpoint/server_info_endpoint.py

@@ -41,5 +41,9 @@ def get(self):
                 raise EndpointUnavailableError(e)
             raise e
 
-        self._info = ServerInfoItem.from_response(server_response.content, self.parent_srv.namespace)
+        try:
+            self._info = ServerInfoItem.from_response(server_response.content, self.parent_srv.namespace)
+        except Exception as e:
+            logging.getLogger(self.__class__.__name__).debug(e)
+            logging.getLogger(self.__class__.__name__).debug(server_response.content)
         return self._info

tableauserverclient/server/server.py

@@ -147,28 +147,32 @@ def _set_auth(self, site_id, user_id, auth_token):
         self._auth_token = auth_token
 
     def _get_legacy_version(self):
-        dest = Endpoint(self)
-        response = dest._make_request(method=self.session.get, url=self.server_address + "/auth?format=xml")
+        # the serverInfo call was introduced in 2.4, earlier than that we have this different call
+        response = self._session.get(self.server_address + "/auth?format=xml")
         try:
             info_xml = fromstring(response.content)
         except ParseError as parseError:
             self.logger.info(parseError)
             self.logger.info("Could not read server version info. The server may not be running or configured.")
             return self.version
         prod_version = info_xml.find(".//product_version").text
-        version = _PRODUCT_TO_REST_VERSION.get(prod_version, default_server_version)  # 2.4
+        version = _PRODUCT_TO_REST_VERSION.get(prod_version, minimum_supported_server_version)
         return version
 
     def _determine_highest_version(self):
         try:
             old_version = self.version
             version = self.server_info.get().rest_api_version
+        except ServerInfoEndpointNotFoundError as e:
+            self.logger.info("Could not get version info from server: {}{}".format(e.__class__, e))
+            version = self._get_legacy_version()
         except EndpointUnavailableError as e:
+            self.logger.info("Could not get version info from server: {}{}".format(e.__class__, e))
             version = self._get_legacy_version()
         except Exception as e:
             self.logger.info("Could not get version info from server: {}{}".format(e.__class__, e))
             version = None
-        self.logger.info(version, old_version)
+        self.logger.info("versions: {}, {}".format(version, old_version))
         return version or old_version
 
     def use_server_version(self):

test/test_server_info.py

@@ -42,7 +42,8 @@ def test_server_info_use_highest_version_downgrades(self):
             m.get(self.server.server_address + "/api/2.4/serverInfo", text=si_response_xml, status_code=404)
             m.get(self.server.server_address + "/auth?format=xml", text=auth_response_xml)
             self.server.use_server_version()
-            self.assertEqual(self.server.version, "2.4")
+            # does server-version[9.2] lookup in PRODUCT_TO_REST_VERSION
+            self.assertEqual(self.server.version, "2.2")
 
     def test_server_info_use_highest_version_upgrades(self):
         with open(SERVER_INFO_GET_XML, "rb") as f: