fix: 心跳403Error时炸心跳任务

This commit is contained in:
Oct-autumn
2025-05-21 15:57:23 +08:00
parent 34233628a6
commit 86b777fe4d
2 changed files with 60 additions and 51 deletions

View File

@@ -68,7 +68,10 @@ class TelemetryHeartBeatTask(AsyncTask):
response = requests.post( response = requests.post(
f"{TELEMETRY_SERVER_URL}/stat/reg_client", f"{TELEMETRY_SERVER_URL}/stat/reg_client",
json={"deploy_time": local_storage["deploy_time"]}, json={"deploy_time": local_storage["deploy_time"]},
timeout=5, # 设置超时时间为5秒
) )
except Exception as e:
logger.error(f"请求UUID时出错: {e}") # 可能是网络问题
logger.debug(f"{TELEMETRY_SERVER_URL}/stat/reg_client") logger.debug(f"{TELEMETRY_SERVER_URL}/stat/reg_client")
@@ -78,8 +81,7 @@ class TelemetryHeartBeatTask(AsyncTask):
if response.status_code == 200: if response.status_code == 200:
data = response.json() data = response.json()
client_id = data.get("mmc_uuid") if client_id := data.get("mmc_uuid"):
if client_id:
# 将UUID存储到本地 # 将UUID存储到本地
local_storage["mmc_uuid"] = client_id local_storage["mmc_uuid"] = client_id
self.client_uuid = client_id self.client_uuid = client_id
@@ -89,8 +91,6 @@ class TelemetryHeartBeatTask(AsyncTask):
logger.error("无效的服务端响应") logger.error("无效的服务端响应")
else: else:
logger.error(f"请求UUID失败状态码: {response.status_code}, 响应内容: {response.text}") logger.error(f"请求UUID失败状态码: {response.status_code}, 响应内容: {response.text}")
except requests.RequestException as e:
logger.error(f"请求UUID时出错: {e}") # 可能是网络问题
# 请求失败,重试次数+1 # 请求失败,重试次数+1
try_count += 1 try_count += 1
@@ -100,11 +100,11 @@ class TelemetryHeartBeatTask(AsyncTask):
return False return False
else: else:
# 如果可以重试,等待后继续(指数退避) # 如果可以重试,等待后继续(指数退避)
logger.info(f"获取UUID失败将于 {4**try_count} 秒后重试...")
await asyncio.sleep(4**try_count) await asyncio.sleep(4**try_count)
async def _send_heartbeat(self): async def _send_heartbeat(self):
"""向服务器发送心跳""" """向服务器发送心跳"""
try:
headers = { headers = {
"Client-UUID": self.client_uuid, "Client-UUID": self.client_uuid,
"User-Agent": f"HeartbeatClient/{self.client_uuid[:8]}", "User-Agent": f"HeartbeatClient/{self.client_uuid[:8]}",
@@ -114,11 +114,15 @@ class TelemetryHeartBeatTask(AsyncTask):
logger.debug(headers) logger.debug(headers)
try:
response = requests.post( response = requests.post(
f"{self.server_url}/stat/client_heartbeat", f"{self.server_url}/stat/client_heartbeat",
headers=headers, headers=headers,
json=self.info_dict, json=self.info_dict,
timeout=5, # 设置超时时间为5秒
) )
except Exception as e:
logger.error(f"心跳发送失败: {e}")
logger.debug(response) logger.debug(response)
@@ -138,9 +142,6 @@ class TelemetryHeartBeatTask(AsyncTask):
# 其他错误 # 其他错误
logger.error(f"心跳发送失败,状态码: {response.status_code}, 响应内容: {response.text}") logger.error(f"心跳发送失败,状态码: {response.status_code}, 响应内容: {response.text}")
except requests.RequestException as e:
logger.error(f"心跳发送失败: {e}")
async def run(self): async def run(self):
# 发送心跳 # 发送心跳
if global_config.telemetry.enable: if global_config.telemetry.enable:

View File

@@ -22,13 +22,21 @@ class LocalStoreManager:
def __getitem__(self, item: str) -> str | list | dict | int | float | bool | None: def __getitem__(self, item: str) -> str | list | dict | int | float | bool | None:
"""获取本地存储数据""" """获取本地存储数据"""
return self.store.get(item, None) return self.store.get(item)
def __setitem__(self, key: str, value: str | list | dict | int | float | bool): def __setitem__(self, key: str, value: str | list | dict | int | float | bool):
"""设置本地存储数据""" """设置本地存储数据"""
self.store[key] = value self.store[key] = value
self.save_local_store() self.save_local_store()
def __delitem__(self, key: str):
"""删除本地存储数据"""
if key in self.store:
del self.store[key]
self.save_local_store()
else:
logger.warning(f"尝试删除不存在的键: {key}")
def __contains__(self, item: str) -> bool: def __contains__(self, item: str) -> bool:
"""检查本地存储数据是否存在""" """检查本地存储数据是否存在"""
return item in self.store return item in self.store