Merge pull request #213 from pnuu/fix-tle-download-timeout-failure

Fix timeout preventing storage of TLEs

Author: mraspaud

pyorbital/tests/test_tlefile.py

@@ -560,7 +560,24 @@ def test_fetch_plain_tle_two_sources(self, requests):
         assert "source_2" in res
         assert len(res["source_2"]) == 1
         assert mock.call("mocked_url_1", timeout=15) in requests.get.mock_calls
-        assert len(requests.get.mock_calls) == 4
+        assert len([c for c in requests.get.mock_calls if c.args]) == 4
+
+    @mock.patch("logging.error")
+    @mock.patch("pyorbital.tlefile.requests.get")
+    def test_fetch_plain_tle_timeout(self, requests_get, logging_error):
+        """Test that timeout is logged."""
+        from requests.exceptions import Timeout
+
+        requests_get.side_effect = Timeout
+
+        self.dl.config["downloaders"] = FETCH_PLAIN_TLE_CONFIG
+
+        res = self.dl.fetch_plain_tle()
+        for url in ["mocked_url_1", "mocked_url_2", "mocked_url_3", "mocked_url_4"]:
+            expected = mock.call(f"Failed to make request to {url} within 15 seconds!")
+            assert expected in logging_error.mock_calls
+        assert not res["source_1"]
+        assert not res["source_2"]
 
     @mock.patch("pyorbital.tlefile.requests")
     def test_fetch_plain_tle_server_is_a_teapot(self, requests):
@@ -580,7 +597,7 @@ def test_fetch_plain_tle_server_is_a_teapot(self, requests):
         assert len(res["source_2"]) == 0
 
         assert mock.call("mocked_url_1", timeout=15) in requests.get.mock_calls
-        assert len(requests.get.mock_calls) == 4
+        assert len([c for c in requests.get.mock_calls if c.args]) == 4
 
     @mock.patch("pyorbital.tlefile.requests")
     def test_fetch_spacetrack_login_fails(self, requests):

pyorbital/tlefile.py

@@ -52,9 +52,6 @@
 LOGGER = logging.getLogger(__name__)
 PKG_CONFIG_DIR = os.path.join(os.path.realpath(os.path.dirname(__file__)), "etc")
 
-class TleDownloadTimeoutError(Exception):
-    """TLE download timeout exception."""
-
 
 def _get_config_path():
     """Get the config path for Pyorbital."""
@@ -485,17 +482,17 @@ def fetch_plain_tle(self):
                     try:
                         req = requests.get(uri, timeout=15)  # 15 seconds
                     except requests.exceptions.Timeout:
-                        raise TleDownloadTimeoutError(f"Failed to make request to {str(uri)} within 15 seconds!")
-                    if req.status_code == 200:
+                        logging.error(f"Failed to make request to {str(uri)} within 15 seconds!")
+                        req = None
+                    if req and req.status_code == 200:
                         tles[source] += _parse_tles_for_downloader((req.text,), io.StringIO)
                     else:
                         failures.append(uri)
                 if len(failures) > 0:
                     logging.error(
                         "Could not fetch TLEs from %s, %d failure(s): [%s]",
                         source, len(failures), ", ".join(failures))
-                logging.info("Downloaded %d TLEs from %s",
-                             len(tles[source]), source)
+                logging.info("Downloaded %d TLEs from %s", len(tles[source]), source)
         return tles
 
     def fetch_spacetrack(self):