From 7b02c6dd44f15a5e2fbed5cd3ac450d77af0b919 Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Mon, 23 Sep 2024 18:44:46 +0100
Subject: [PATCH] Refactor timeout handling in monitor types to return null
 instead of failure response

---
 Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts     | 3 +--
 Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts    | 5 +----
 Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts     | 5 +----
 Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts | 4 +---
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts
index 9b5532fb908..99dfe8a1854 100644
--- a/Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts
+++ b/Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts
@@ -187,8 +187,7 @@ export default class ApiMonitor {
           `API Monitor - Timeout exceeded ${options.monitorId?.toString()} ${requestType} ${url.toString()} - ERROR: ${err}`,
         );
 
-        apiResponse.failureCause = "Timeout exceeded";
-        apiResponse.isOnline = false;
+        return null; // timeout exceeded
       }
 
       logger.error(
diff --git a/Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts
index b93e1be0ccd..30737105653 100644
--- a/Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts
+++ b/Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts
@@ -124,10 +124,7 @@ export default class PingMonitor {
           `Ping Monitor - Timeout exceeded ${pingOptions.monitorId?.toString()} ${host.toString()} - ERROR: ${err}`,
         );
 
-        return {
-          isOnline: false,
-          failureCause: "Host is not reachable. Timeout exceeded.",
-        };
+        return null;
       }
 
       // check if the probe is online.
diff --git a/Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts
index df633f1debc..59b4dae13a2 100644
--- a/Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts
+++ b/Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts
@@ -88,10 +88,7 @@ export default class SSLMonitor {
           `Ping Monitor - Timeout exceeded ${pingOptions.monitorId?.toString()} ${url.toString()} - ERROR: ${err}`,
         );
 
-        return {
-          isOnline: false,
-          failureCause: "Timeout exceeded",
-        };
+        return null;
       }
 
       // check if the probe is online.
diff --git a/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts
index 9d287957ba9..36745d818b3 100644
--- a/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts
+++ b/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts
@@ -161,10 +161,8 @@ export default class WebsiteMonitor {
         logger.debug(
           `Website Monitor - Timeout exceeded ${options.monitorId?.toString()} ${requestType} ${url.toString()} - ERROR: ${err}`,
         );
-        probeWebsiteResponse.failureCause = "Timeout exceeded";
-        probeWebsiteResponse.isOnline = false;
 
-        return probeWebsiteResponse;
+        return null;
       }
 
       if (!options.isOnlineCheckRequest) {