This closes issue20

README.md

@@ -17,4 +17,9 @@ Both CPU/RAM monitoring and URL monitoring can be set on their own monitoring pe
 - **sqlUsername** - the username used to authenticate to the SQL server.
 - **sqlPassword** - the password used to authenticate to the SQL server.
 - **logRetentionDays** - the maximum age logs should be kept.
-- **maximumSQLAttempts** - the maximum number of attempts to try certain SQL operations
+- **maximumSQLAttempts** - the maximum number of attempts to try certain SQL operations.
+- **hostMonitorStartTime** - the start time which the host monitor should start at the earliest
+- **hostMonitorEndTime** - the end time which the host monitor should shut down.
+- **urlMonitorStartTime** - the start time which the url monitor should start at the earliest
+- **urlMonitorEndTime** - the end time which the url monitor whould shut down.
+

main.py

@@ -88,13 +88,13 @@ def getNonPOSIXCPUAverage():
 
     return avgLoad
 
+
 def monitorHost(stop_event):
 
-    while time.strftime("%H:%M:%S") <= config.hostMonitorStartTime:
-           time.sleep(1) # This block is important to ensure the thread sleeps until the start time is reached. Else the thread wont start if the script is started before the start time
-
     nonPOSIXCPUStarted = False
 
+    while not (stop_event.is_set()):
+
         while not (stop_event.is_set()) and (time.strftime("%H:%M:%S") >= config.hostMonitorStartTime and time.strftime("%H:%M:%S") <= config.hostMonitorEndTime):
         
             if os.name != 'posix' or config.forceNonPOSIXCPU:
@@ -113,6 +113,7 @@ def monitorHost(stop_event):
                 loadavg = round((load1/os.cpu_count()) * 100, 2)
         
             memory = psutil.virtual_memory().percent
+            
             logHostLog(socket.gethostname(), datetime.now(), loadavg, memory)
 
             print("CPU %: " + str(loadavg))
@@ -121,10 +122,11 @@ def monitorHost(stop_event):
 
             time.sleep(config.hostMonitoringPeriod)
 
+        time.sleep(1)
+
 def monitorUrls(stop_event):
 
-    while time.strftime("%H:%M:%S") <= config.urlMonitorStartTime:
+    while not (stop_event.is_set()):
-           time.sleep(1) # This block is important to ensure the thread sleeps until the start time is reached. Else the thread wont start if the script is started before the start time
 
         while not (stop_event.is_set()) and (time.strftime("%H:%M:%S") >= config.urlMonitorStartTime and time.strftime("%H:%M:%S") <= config.urlMonitorEndTime):
 
@@ -134,6 +136,7 @@ def monitorUrls(stop_event):
                 urlFail = False
 
                 startTime = time.time()
+                
                 request = loadUrl(url)
 
                 if request.status_code == 200:
@@ -149,6 +152,7 @@ def monitorUrls(stop_event):
                         for response in responses:
 
                             if not response.status_code == 200:
+
                                 urlFail = True
                             
                         endTime = time.time()
@@ -156,13 +160,17 @@ def monitorUrls(stop_event):
                                 
                         print(baseUrl + " response time: " + str(timeDiff))
                         print() # new line
+                        
                         logURLLog(socket.gethostname(), datetime.now(), baseUrl, timeDiff)
 
                 else:
+
                     urlFail = True
 
             time.sleep(config.urlMonitoringPeriod)
 
+        time.sleep(1)
+
 def logHostLog(hostname, logTime, cpu, memory):
 
     if not config.loggingMode == 'none':