From 7e46b1062e49225a324726a3a9c3cac600430b8f Mon Sep 17 00:00:00 2001
From: cppla <i@cpp.la>
Date: Sun, 21 Jan 2024 21:34:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=B4=E6=98=8E=EF=BC=8C?=
=?UTF-8?q?=E6=AF=94=E8=BE=83=E7=B2=97=E7=B3=99=E4=B8=8D=E5=BB=BA=E8=AE=AE?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
clients/client-linux.py | 4 +++-
clients/client-psutil.py | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/clients/client-linux.py b/clients/client-linux.py
index 0574453..4d79bed 100755
--- a/clients/client-linux.py
+++ b/clients/client-linux.py
@@ -3,6 +3,7 @@
# Update by : https://github.com/cppla/ServerStatus, Update date: 20220530
# 版本：1.0.3, 支持Python版本：2.7 to 3.10
# 支持操作系统： Linux, OSX, FreeBSD, OpenBSD and NetBSD, both 32-bit and 64-bit architectures
+# ONLINE_PACKET_HISTORY_LEN， 探测间隔60s，记录24小时在线率（1440）；探测间隔60s，记录7天（10080）；探测时间30s，记录24小时（2880）
# 说明: 默认情况下修改server和user就可以了。丢包率监测方向可以自定义，例如：CU = "www.facebook.com"。
SERVER = "127.0.0.1"
@@ -17,6 +18,7 @@ CM = "cm.tz.cloudcpp.com"
PROBEPORT = 80
PROBE_PROTOCOL_PREFER = "ipv4" # ipv4, ipv6
PING_PACKET_HISTORY_LEN = 100
+ONLINE_PACKET_HISTORY_LEN = 1440
INTERVAL = 1
import socket
@@ -319,7 +321,7 @@ def get_realtime_data():
def _monitor_thread(name, host, interval, type):
lostPacket = 0
- packet_queue = Queue(maxsize=PING_PACKET_HISTORY_LEN)
+ packet_queue = Queue(maxsize=ONLINE_PACKET_HISTORY_LEN)
while True:
if name not in monitorServer.keys():
monitorServer[name] = {
diff --git a/clients/client-psutil.py b/clients/client-psutil.py
index c2b3928..d468fcb 100755
--- a/clients/client-psutil.py
+++ b/clients/client-psutil.py
@@ -4,6 +4,7 @@
# 依赖于psutil跨平台库
# 版本：1.0.3, 支持Python版本：2.7 to 3.10
# 支持操作系统： Linux, Windows, OSX, Sun Solaris, FreeBSD, OpenBSD and NetBSD, both 32-bit and 64-bit architectures
+# ONLINE_PACKET_HISTORY_LEN， 探测间隔60s，记录24小时在线率（1440）；探测时间60s，记录7天在线率（10080）；探测时间30s，记录24小时（2880）
# 说明: 默认情况下修改server和user就可以了。丢包率监测方向可以自定义，例如：CU = "www.facebook.com"。
SERVER = "127.0.0.1"
@@ -18,6 +19,7 @@ CM = "cm.tz.cloudcpp.com"
PROBEPORT = 80
PROBE_PROTOCOL_PREFER = "ipv4" # ipv4, ipv6
PING_PACKET_HISTORY_LEN = 100
+ONLINE_PACKET_HISTORY_LEN = 1440
INTERVAL = 1
import socket
@@ -307,7 +309,7 @@ def get_realtime_data():
def _monitor_thread(name, host, interval, type):
lostPacket = 0
- packet_queue = Queue(maxsize=PING_PACKET_HISTORY_LEN)
+ packet_queue = Queue(maxsize=ONLINE_PACKET_HISTORY_LEN)
while True:
if name not in monitorServer.keys():
monitorServer[name] = {