README.md

@@ -1,11 +1,4 @@
 # uptime-monitor
 
-A simple script to send http/https requests to your own sites to check if they are working.
-
-
 example:
-
-![blog](http://hk.clf3.org/blog.png)
-![cloud](http://hk.clf3.org/cloud.png)
-![code](http://hk.clf3.org/code.png)
-![git](http://hk.clf3.org/git.png)
+![UPtime](http://hk.clf3.org/image.png)

main.py

@@ -3,15 +3,8 @@ import numpy as np
 import urllib.request
 from datetime import datetime
 import time
-import os
-recent_blog=[]
-recent_cloud=[]
-recent_code=[]
-recent_git=[]
-blog=[]
-cloud=[]
-code=[]
-git=[]
+recent=[]
+history=[]
 width=720
 height=50
 red=(0x00,0x00,0xff)
@@ -19,9 +12,7 @@ orange=(0x00,0x66,0xff)
 yellow=(0x00,0xcc,0xff)
 light_green=(0x33,0xff,0xcc)
 green=(0x00,0xcc,0x00)
-imgpath="/tmp/uptime-graph/"
-
-def update_history(history,recent):
+def update_history():
     average=0
     for i in recent:
         average+=i
@@ -33,7 +24,7 @@ def fill(img,pos,color):
     for i in range(5):
         for j in range(height):
             img[j,i+5*pos,:]=[color[0]%256,color[1]%256,color[2]%256]
-def update_graph(filename,history):
+def update_graph():
     img=np.ones([height,width,3],dtype=np.uint8)
     for i,delay in enumerate(history):
         if delay>=5000:
@@ -46,89 +37,39 @@ def update_graph(filename,history):
             fill(img,i,light_green)
         else:
             fill(img,i,green)
-    cv2.imwrite(imgpath+filename, img)        
+    cv2.imwrite("/tmp/uptime-graph/image.png", img)        
 
 
     
 def testConnect(url):
     try:
         time1=datetime.now().timestamp()
-        status_code=urllib.request.urlopen(url,timeout=5).getcode()
+        code=urllib.request.urlopen(url,timeout=5).getcode()
         time2=datetime.now().timestamp()
         delay=int((time2-time1)*1000)
     except:
-        status_code=404
-    if status_code/100>=4:
+        code=404
+    if code/100>=4:
         delay=10000
-    return (status_code,delay)
+    return (code,delay)
 
 if __name__=="__main__":
-    if not os.path.exists(imgpath):#如果路径不存在
-        os.makedirs(imgpath)
+    lastminute=-1
     while True:
-        time.sleep(0.5)
-        if datetime.now().second==0:
-            time.sleep(1)
-            (status_code,delay)=testConnect("https://blog.clf3.org")
-            print(status_code,end=" ")
-            if status_code/100<=3:
-                print("connected",delay,"ms")
-            else:
-                print("error")
-            if len(recent_blog)<10:
-                recent_blog.append(delay)
-            else:
-                update_history(blog,recent_blog)
-                update_graph("blog.png",blog)
-                recent_blog=[]
-                recent_blog.append(delay)
-
-        elif datetime.now().second==10:
-            time.sleep(1)
-            (status_code,delay)=testConnect("https://cloud.clf3.org")
-            print(status_code,end=" ")
-            if status_code/100<=3:
-                print("connected",delay,"ms")
-            else:
-                print("error")
-            if len(recent_cloud)<10:
-                recent_cloud.append(delay)
-            else:
-                update_history(cloud,recent_cloud)
-                update_graph("cloud.png",cloud)
-                recent_cloud=[]
-                recent_cloud.append(delay)
- 
-        elif datetime.now().second==20:
+        if datetime.now().second==0 and datetime.now().minute!=lastminute:
         # if True:
-            time.sleep(1)
-            (status_code,delay)=testConnect("https://code.clf3.org")
-            print(status_code,end=" ")
-            if status_code/100<=3:
+            time.sleep(0.5)
+            (code,delay)=testConnect("https://blog.clf3.org")
+            print(code,end=" ")
+            if code/100<=3:
                 print("connected",delay,"ms")
             else:
                 print("error")
-            if len(recent_code)<10:
-                recent_code.append(delay)
+            if len(recent)<10:
+                recent.append(delay)
             else:
-                update_history(code,recent_code)
-                update_graph("code.png",code)
-                recent_code=[]
-                recent_code.append(delay)
-
-        elif datetime.now().second==30:
-        # if True:
-            time.sleep(1)
-            (status_code,delay)=testConnect("https://git.clf3.org")
-            print(status_code,end=" ")
-            if status_code/100<=3:
-                print("connected",delay,"ms")
-            else:
-                print("error")
-            if len(recent_git)<10:
-                recent_git.append(delay)
-            else:
-                update_history(git,recent_git)
-                update_graph("git.png",git)
-                recent_git=[]
-                recent_git.append(delay)
+                update_history()
+                update_graph()
+                recent=[]
+                recent.append(delay)
+            lastminute=datetime.now().minute