From 16daf24dfcd25726a292d45a6c43bc68f0adcd57 Mon Sep 17 00:00:00 2001 From: liuwei Date: Wed, 6 May 2026 10:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4Glances=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E4=B8=8E=E9=81=97=E7=95=99=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.example.yaml | 4 ---- config.yaml | 4 ---- configuration.py | 7 +------ requirements.txt | 2 -- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/config.example.yaml b/config.example.yaml index 3b60420..2cda947 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -31,10 +31,6 @@ email_config: sender_password: "${ABOT_EMAIL_PASSWORD:}" alert_recipient: "${ABOT_EMAIL_ALERT_RECIPIENT:}" -glances: - host: "${ABOT_GLANCES_HOST:127.0.0.1}" - port: "${ABOT_GLANCES_PORT:61208}" - wx_config: # 微信管理账号，用于接收部分管理员指令。 admin: [ "${ABOT_WX_ADMIN:admin}" ] diff --git a/config.yaml b/config.yaml index 3b60420..2cda947 100644 --- a/config.yaml +++ b/config.yaml @@ -31,10 +31,6 @@ email_config: sender_password: "${ABOT_EMAIL_PASSWORD:}" alert_recipient: "${ABOT_EMAIL_ALERT_RECIPIENT:}" -glances: - host: "${ABOT_GLANCES_HOST:127.0.0.1}" - port: "${ABOT_GLANCES_PORT:61208}" - wx_config: # 微信管理账号，用于接收部分管理员指令。 admin: [ "${ABOT_WX_ADMIN:admin}" ] diff --git a/configuration.py b/configuration.py index 114bcd0..e3beb85 100644 --- a/configuration.py +++ b/configuration.py @@ -168,7 +168,7 @@ class Config(object): db_config["pool_size"] = self._safe_int(db_config.get("pool_size", 10), 10) normalized["db_config"] = db_config - # Redis / 邮件 / Glances 配置中不少值来自环境变量，解析后先统一转型， + # Redis / 邮件 配置中不少值来自环境变量，解析后先统一转型， # 这样后续业务代码就不需要到处防守“字符串数字”的情况。 redis_config = dict(normalized.get("redis_config", {}) or {}) redis_config["port"] = self._safe_int(redis_config.get("port", 6379), 6379) @@ -180,10 +180,6 @@ class Config(object): email_config["smtp_port"] = self._safe_int(email_config.get("smtp_port", 465), 465) normalized["email_config"] = email_config - glances_config = dict(normalized.get("glances", {}) or {}) - glances_config["port"] = self._safe_int(glances_config.get("port", 61208), 61208) - normalized["glances"] = glances_config - return normalized @classmethod @@ -430,7 +426,6 @@ class Config(object): self.mariadb = self.resolved_config.get("db_config", {}) self.redis = self.resolved_config.get("redis_config", {}) self.email = self.resolved_config.get("email_config", {}) - self.glances = self.resolved_config.get("glances", {}) self.wx_config = self.resolved_config.get("wx_config", {}) self.llm = self.resolved_config.get("llm", {}) diff --git a/requirements.txt b/requirements.txt index 11e5ff5..dbe1c2b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -45,8 +45,6 @@ loguru~=0.7.3 opencv-python~=4.11.0.86 pathlib~=1.0.1 -Glances~=4.3.1 - aiofiles~=24.1.0 undetected-chromedriver~=3.5.5 urllib3~=2.5.0