diff --git a/README.md b/README.md index 82917cc..1172651 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ `Watchdog🐶已经加入,触发式告警。 interval只是为了防止频繁收到报警信息造成骚扰,并不是探测间隔。` -# 目录介绍: +# 目录: * clients 客户端文件 * server 服务端文件 @@ -21,7 +21,7 @@ * server/config.json 探针配置文件 * web/json 探针月流量 -# 自动部署: +# 部署: 【服务端】: ```bash @@ -42,6 +42,11 @@ eg: wget --no-check-certificate -qO client-linux.py 'https://raw.githubusercontent.com/cppla/ServerStatus/master/clients/client-linux.py' && nohup python3 client-linux.py SERVER=45.79.67.132 USER=s04 >/dev/null 2>&1 & ``` +# 主题: + +* layui:https://github.com/zeyudada/StatusServerLayui +<img src=https://dl.cpp.la/Archive/serverstatus_layui.png width=200 height=100 /> + # 手动安装教程: **【服务端配置】** diff --git a/clients/client-linux.py b/clients/client-linux.py index cfac848..00e59d5 100755 --- a/clients/client-linux.py +++ b/clients/client-linux.py @@ -155,17 +155,18 @@ def _ping_thread(host, mark, port): lostPacket = 0 packet_queue = Queue(maxsize=PING_PACKET_HISTORY_LEN) - IP = host - if host.count(':') < 1: # if not plain ipv6 address, means ipv4 address or hostname - try: - if PROBE_PROTOCOL_PREFER == 'ipv4': - IP = socket.getaddrinfo(host, None, socket.AF_INET)[0][4][0] - else: - IP = socket.getaddrinfo(host, None, socket.AF_INET6)[0][4][0] - except Exception: + while True: + # flush dns , every time. + IP = host + if host.count(':') < 1: # if not plain ipv6 address, means ipv4 address or hostname + try: + if PROBE_PROTOCOL_PREFER == 'ipv4': + IP = socket.getaddrinfo(host, None, socket.AF_INET)[0][4][0] + else: + IP = socket.getaddrinfo(host, None, socket.AF_INET6)[0][4][0] + except Exception: pass - while True: if packet_queue.full(): if packet_queue.get() == 0: lostPacket -= 1 diff --git a/clients/client-psutil.py b/clients/client-psutil.py index 19403cd..ceac788 100755 --- a/clients/client-psutil.py +++ b/clients/client-psutil.py @@ -153,17 +153,18 @@ def _ping_thread(host, mark, port): lostPacket = 0 packet_queue = Queue(maxsize=PING_PACKET_HISTORY_LEN) - IP = host - if host.count(':') < 1: # if not plain ipv6 address, means ipv4 address or hostname - try: - if PROBE_PROTOCOL_PREFER == 'ipv4': - IP = socket.getaddrinfo(host, None, socket.AF_INET)[0][4][0] - else: - IP = socket.getaddrinfo(host, None, socket.AF_INET6)[0][4][0] - except Exception: + while True: + # flush dns, every time. + IP = host + if host.count(':') < 1: # if not plain ipv6 address, means ipv4 address or hostname + try: + if PROBE_PROTOCOL_PREFER == 'ipv4': + IP = socket.getaddrinfo(host, None, socket.AF_INET)[0][4][0] + else: + IP = socket.getaddrinfo(host, None, socket.AF_INET6)[0][4][0] + except Exception: pass - while True: if packet_queue.full(): if packet_queue.get() == 0: lostPacket -= 1