imp: error messages

Author: WiktorBoro

README.md

@@ -77,6 +77,7 @@ Available tags for each message (tags doesn't work only for `no_unhealthy_messag
 {url} # requested url
 {param} # requested param (look to `to_checks` section)
 {status_code} # status_code after request
+{error_message} # if request has some error message you can find it over this tag
 {is_healthy} # true/fals
 {how_long_was_unhealthy} # in min, if url was healthy this tag return 0
 {summary} # only for monthly summary string of: f"{url_with_monthly_dead_time.url}: {url_with_monthly_dead_time.unhealthy_this_month} min, efficiency: {(self.AVERAGE_MINUTES_IN_MONTH-url_with_monthly_dead_time.unhealthy_this_month)/self.AVERAGE_MINUTES_IN_MONTH}%\n"

configuration_example.json

@@ -17,10 +17,10 @@
     "send_if_there_no_unhealthy": false,
     "hello_message": ":wave: Hi, we are connected! Let's go! :tada:",
     "healthy_message": "URL {url} is fine :heart:",
-    "unhealthy_message": "URL {url} is dead :firecracker::skull_and_crossbones::firecracker:",
+    "unhealthy_message": "URL {url} is dead, status code: {status_code}, error message: {error_message} :firecracker::skull_and_crossbones::firecracker:",
     "no_unhealthy_message": "Everything is fine :green_heart:",
     "back_to_healthy_message": "URL {url}, back to live! :tada: Total dead time {how_long_was_unhealthy} min",
-    "still_unhealthy_message": "URL {url}, is still dead :firecracker::skull_and_crossbones::firecracker: Total dead time {how_long_was_unhealthy} min"
+    "still_unhealthy_message": "URL {url}, is still dead, status code: {status_code}, error message: {error_message} :firecracker::skull_and_crossbones::firecracker: Total dead time {how_long_was_unhealthy} min"
   },
   "to_checks": [
     {

dtos.py

@@ -40,6 +40,7 @@ class HealthResultDTO:
     url: str
     param: str
     is_sent_to_slack: bool = False
+    error_message: str = ""
 
 
 @define(kw_only=True)

health_check.py

@@ -77,25 +77,63 @@ async def _health_check(
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.get(url, timeout=self.config.timeout) as response:
+                    status_code = response.status
                     health_result = HealthResultDTO(
-                        is_healthy=response.status_code == self.HEALTHY_STATUS_CODE,
-                        status_code=response.status_code,
+                        is_healthy=status_code == self.HEALTHY_STATUS_CODE,
+                        status_code=status_code,
                         param=param,
                         url=url,
                     )
-        except (
-            asyncio.TimeoutError,
-            aiohttp.ClientError,
-            ConnectTimeout,
-            ReadTimeout,
-        ):
+        except asyncio.TimeoutError:
             health_result = HealthResultDTO(
                 is_healthy=False,
-                status_code=408,
+                status_code=-1,
                 param=param,
                 url=url,
+                error_message="Client-side timeout",
             )
+        except aiohttp.ClientConnectionError:
+            health_result = HealthResultDTO(
+                is_healthy=False,
+                status_code=-1,
+                param=param,
+                url=url,
+                error_message="Connection error occurred",
+            )
+        except aiohttp.ClientResponseError as e:
+            health_result = HealthResultDTO(
+                is_healthy=False,
+                status_code=e.status,
+                param=param,
+                url=url,
+                error_message=str(e.message),
+            )
+        except aiohttp.InvalidURL:
+            health_result = HealthResultDTO(
+                is_healthy=False,
+                status_code=-1,
+                param=param,
+                url=url,
+                error_message="Invalid URL",
+            )
+        except aiohttp.ClientPayloadError:
+            health_result = HealthResultDTO(
+                is_healthy=False,
+                status_code=-1,
+                param=param,
+                url=url,
+                error_message="Payload error",
+            )
+        except aiohttp.ClientError as e:
+            health_result = HealthResultDTO(
+                is_healthy=False,
+                status_code=-1,
+                param=param,
+                url=url,
+                error_message=str(e),
+            )
+
         logging.info(
-            f"{datetime.now()} - url: {health_result.url} - param: {health_result.param} - status_code: {health_result.status_code} - is_healthy: {health_result.is_healthy}"
+            f"{datetime.now()} - url: {health_result.url} - param: {health_result.param} - status_code: {health_result.status_code} - is_healthy: {health_result.is_healthy} - error_message: {health_result.error_message}"
         )
         return health_result

slack_connector.py

@@ -55,7 +55,7 @@ def send_health_check_report(self, *, health_check_dto: HealthCheckDTO):
             )
         if self.config.send_unhealthy:
             self._send_results(
-                health_results=health_check_dto.unhealthy,
+                health_results=health_check_dto.new_unhealthy,
                 message=self.config.unhealthy_message or self.DEFAULT_UNHEALTHY_MESSAGE,
             )
 
@@ -106,6 +106,7 @@ def _send_results(
                     how_long_was_unhealthy=self.repository.get_how_long_was_unhealthy(
                         url=health_result.url
                     ),
+                    error_message=health_result.error_message,
                 )
             )
             health_result.is_sent_to_slack = True