From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 1 Oct 2017 18:27:30 +0000 (+0200)
Subject: Consider ourselves unhealthy if fetching from localhost fails
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=abfd6653467780d33fca5d4351ccd8447484f24d;p=mirror%2Fdsa-puppet.git

Consider ourselves unhealthy if fetching from localhost fails
---

diff --git a/modules/roles/files/mirror_health/mirror-health b/modules/roles/files/mirror_health/mirror-health
index d3df95f37..a4df165a3 100755
--- a/modules/roles/files/mirror_health/mirror-health
+++ b/modules/roles/files/mirror_health/mirror-health
@@ -45,7 +45,10 @@ def check_uptodate():
             latest_ts = max(latest_ts, lm)
         except (requests.exceptions.ProxyError, requests.exceptions.ReadTimeout):
             pass
-    local_lm = last_modified(retrieve_from_host('localhost', URL))
+    try:
+        local_lm = last_modified(retrieve_from_host('localhost', URL))
+    except (requests.exceptions.ProxyError, requests.exceptions.ReadTimeout):
+        return False
     logging.debug("lm for localhost: %s", local_lm)
     if local_lm < latest_ts:
         logging.info("considering myself unhealthy my ts=%s latest_ts=%s", local_lm, latest_ts)