Merge pull request #995 from bensonhome/main

🎨增加心跳异常捕获
Tencent · Feb 1, 2024 · bf80bc7 · bf80bc7
2 parents 5023b7f + 02f171b
commit bf80bc7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/client/node/localtask/jobheartbeat.py b/client/node/localtask/jobheartbeat.py
@@ -36,8 +36,11 @@ def __init__(self, event, org_sid, team_name, repo_id, project_id, job_id, serve
 
     def run(self):
         while self._event.is_set():
+            try:
+                self._server.job_heart_beat(self._org_sid, self._team_name, self._repo_id, self._project_id, self._job_id)
+            except Exception as err:
+                logger.exception(f"job heartbeat error: {str(err)}")
             time.sleep(self._sleep_interval)
-            self._server.job_heart_beat(self._org_sid, self._team_name, self._repo_id, self._project_id, self._job_id)
 
 
 class JobHeartBeat(object):

diff --git a/client/node/servertask/nodemgr.py b/client/node/servertask/nodemgr.py
@@ -118,7 +118,10 @@ def _thread_beat(self):
             host_ip = HostNetMgr().get_host_ip()
             data = {"puppy_ip": host_ip}
             # LogPrinter.info(f">>> data: {data}")
-            self._server.heart_beat(data)
+            try:
+                self._server.heart_beat(data)
+            except Exception as err:
+                LogPrinter.exception(f"heart beat error: {str(err)}")
             time.sleep(self._beat_interval)
 
     def start(self):