spark-store-project/ServerStatus
15
0
Fork 0
mirror of https://github.com//cppla/ServerStatus synced 2026-03-23 06:09:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复传递参数优先级的问题，防止错误获取系统变量

Browse Source
This commit is contained in:
cppla
2026-03-20 11:51:05 +08:00
parent 23a620274d
commit f24a70b9d7
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clients/client-linux.py
View File

@@ -5,8 +5,8 @@
# 支持操作系统： Linux, OSX, FreeBSD, OpenBSD and NetBSD, both 32-bit and 64-bit architectures # 支持操作系统： Linux, OSX, FreeBSD, OpenBSD and NetBSD, both 32-bit and 64-bit architectures
# 说明: 默认情况下修改server和user就可以了。丢包率监测方向可以自定义，例如：CU = "www.facebook.com"。 # 说明: 默认情况下修改server和user就可以了。丢包率监测方向可以自定义，例如：CU = "www.facebook.com"。
SERVER = "127.0.0.1" SERVER = ""
USER = "s01" USER = ""
PASSWORD = "USER_DEFAULT_PASSWORD" PASSWORD = "USER_DEFAULT_PASSWORD"
@@ -47,9 +47,9 @@ def _env_int(name, default):
except ValueError: except ValueError:
return default return default
# Allow docker env overrides # Allow docker env overrides. 优先级：运行程序传递参数 > 用户修改的USER > Docker/系统
SERVER = _env_str("SERVER", SERVER) SERVER = _env_str("SERVER", SERVER) if SERVER == "" else SERVER
USER = _env_str("USER", USER) USER = _env_str("USER", USER) if USER == "" else USER
PASSWORD = _env_str("PASSWORD", PASSWORD) PASSWORD = _env_str("PASSWORD", PASSWORD)
PORT = _env_int("PORT", PORT) PORT = _env_int("PORT", PORT)
INTERVAL = _env_int("INTERVAL", INTERVAL) INTERVAL = _env_int("INTERVAL", INTERVAL)

10
clients/client-psutil.py
View File

@@ -6,8 +6,8 @@
# 支持操作系统： Linux, Windows, OSX, Sun Solaris, FreeBSD, OpenBSD and NetBSD, both 32-bit and 64-bit architectures # 支持操作系统： Linux, Windows, OSX, Sun Solaris, FreeBSD, OpenBSD and NetBSD, both 32-bit and 64-bit architectures
# 说明: 默认情况下修改server和user就可以了。丢包率监测方向可以自定义，例如：CU = "www.facebook.com"。 # 说明: 默认情况下修改server和user就可以了。丢包率监测方向可以自定义，例如：CU = "www.facebook.com"。
SERVER = "127.0.0.1" SERVER = ""
USER = "s01" USER = ""
PASSWORD = "USER_DEFAULT_PASSWORD" PASSWORD = "USER_DEFAULT_PASSWORD"
@@ -47,9 +47,9 @@ def _env_int(name, default):
except ValueError: except ValueError:
return default return default
# Allow docker env overrides # Allow docker env overrides. 优先级：运行程序传递参数 > 用户修改的USER > Docker/系统
SERVER = _env_str("SERVER", SERVER) SERVER = _env_str("SERVER", SERVER) if SERVER == "" else SERVER
USER = _env_str("USER", USER) USER = _env_str("USER", USER) if USER == "" else USER
PASSWORD = _env_str("PASSWORD", PASSWORD) PASSWORD = _env_str("PASSWORD", PASSWORD)
PORT = _env_int("PORT", PORT) PORT = _env_int("PORT", PORT)
INTERVAL = _env_int("INTERVAL", INTERVAL) INTERVAL = _env_int("INTERVAL", INTERVAL)