From 56ddd3a7718a23853e8e2b0320f2867d30b79e12 Mon Sep 17 00:00:00 2001
From: Iain Learmonth <irl@sr2.uk>
Date: Thu, 12 May 2022 10:13:49 +0100
Subject: [PATCH] alarms: handle ConnectionError in http_check

---
 app/terraform/alarms/proxy_http_status.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/terraform/alarms/proxy_http_status.py b/app/terraform/alarms/proxy_http_status.py
index 5e31dbb..6137428 100644
--- a/app/terraform/alarms/proxy_http_status.py
+++ b/app/terraform/alarms/proxy_http_status.py
@@ -50,15 +50,16 @@ class AlarmProxyHTTPStatusAutomation(BaseAutomation):
                         AlarmState.OK,
                         f"{r.status_code} {r.reason}"
                     )
-            except (requests.ConnectionError, requests.Timeout):
-                set_http_alarm(
-                    proxy.id,
-                    AlarmState.CRITICAL,
-                    f"Connection failure")
             except requests.HTTPError:
                 set_http_alarm(
                     proxy.id,
                     AlarmState.CRITICAL,
                     f"{r.status_code} {r.reason}"
                 )
-        return True, []
\ No newline at end of file
+            except (requests.ConnectionError, requests.Timeout, ConnectionError) as e:
+                set_http_alarm(
+                    proxy.id,
+                    AlarmState.CRITICAL,
+                    repr(e)
+                )
+        return True, ""