From 947e581da2c873ee5df2f0123b43ef9b088472ac Mon Sep 17 00:00:00 2001
From: Mans Ziesel <mans@mziesel.com>
Date: Sun, 4 Feb 2024 14:43:36 +0100
Subject: [PATCH] undo changes

---
 src/BaseMonitor.java | 13 ++-----------
 src/HTTPMonitor.java |  5 +----
 src/ICMPMonitor.java | 15 ++-------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/BaseMonitor.java b/src/BaseMonitor.java
index b31d664..66d9bf0 100644
--- a/src/BaseMonitor.java
+++ b/src/BaseMonitor.java
@@ -41,23 +41,14 @@ public abstract class BaseMonitor implements Runnable {
     }
     public abstract MonitorStatus check() throws IOException, InterruptedException;
 
-//    public void checkCmd() throws IOException, InterruptedException {
-//        MonitorStatus currStatus = this.check();
-//
-//        if (currStatus == MonitorStatus.ONLINE) {
-//            System.out.println(this.getFriendlyName() + ", with address '" + this.getTarget() + "' is online!");
-//        } else if (currStatus == MonitorStatus.OFFLINE) {
-//            System.out.println(this.getFriendlyName() + ", with address '" + this.getTarget() + "' is offline!");
-//        }
-//    }
     @Override
     public void run() {
         System.out.println("Monitor '" + this.friendlyName + "' start status: " + this.prevCheckStatus);
         while (true) {
             try {
-                MonitorStatus prevStatus = this.prevCheckStatus;
                 MonitorStatus checkStatus = this.check();
-                if (prevStatus != checkStatus) {
+                if (this.prevCheckStatus != checkStatus) {
+                    this.setPrevCheckStatus(checkStatus);
                     System.out.println("Monitor '" + this.getFriendlyName() + "', changed, new status: " + checkStatus);
                 }
                 Thread.sleep(this.getInterval());
diff --git a/src/HTTPMonitor.java b/src/HTTPMonitor.java
index bc0fbc4..d4a6a5b 100644
--- a/src/HTTPMonitor.java
+++ b/src/HTTPMonitor.java
@@ -11,9 +11,6 @@ public class HTTPMonitor extends BaseMonitor{
     public MonitorStatus check() throws IOException {
         URI uri = URI.create(super.getTarget());
         HttpsURLConnection conn = (HttpsURLConnection) uri.toURL().openConnection();
-        MonitorStatus checkStatus = (conn.getResponseCode() == 200) ? MonitorStatus.ONLINE : MonitorStatus.OFFLINE;
-
-        super.setPrevCheckStatus(checkStatus);
-        return checkStatus;
+        return (conn.getResponseCode() == 200) ? MonitorStatus.ONLINE : MonitorStatus.OFFLINE;
     }
 }
diff --git a/src/ICMPMonitor.java b/src/ICMPMonitor.java
index 0a32eab..8c55a40 100644
--- a/src/ICMPMonitor.java
+++ b/src/ICMPMonitor.java
@@ -1,6 +1,6 @@
 import java.io.IOException;
 
-public class ICMPMonitor extends BaseMonitor{
+public class ICMPMonitor extends BaseMonitor {
     public ICMPMonitor(String name, String target) {
         super(name, target);
     }
@@ -9,17 +9,6 @@ public class ICMPMonitor extends BaseMonitor{
     public MonitorStatus check() throws IOException, InterruptedException {
         Process p1 = java.lang.Runtime.getRuntime().exec("ping -c 1 " + this.getTarget());
         int returnVal = p1.waitFor();
-        if (returnVal==0) {
-            return MonitorStatus.ONLINE;
-        } else {
-            return MonitorStatus.OFFLINE;
-        }
-//        InetAddress address = InetAddress.getByName(super.getTarget());
-//        return address.isReachable(super.getTimeout());
-    }
-
-    @Override
-    public void run() {
-
+        return (returnVal == 0) ? MonitorStatus.ONLINE : MonitorStatus.OFFLINE;
     }
 }
\ No newline at end of file