Refactor timeout handling in monitor types to return null instead of …

…failure response
OneUptime · Sep 23, 2024 · 7b02c6d · 7b02c6d
1 parent 063b9b3
commit 7b02c6d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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) {