[Update] 修改心跳数据

Author: ibuler

jms/service.py

@@ -79,7 +79,7 @@ def valid_auth(self):
             user = self.get_profile()
             if not user:
                 msg = "Connect server error or access key is invalid, " \
-                      "remove `./keys/.access_key` run again"
+                      "remove `./data/keys/.access_key` run again"
                 logger.error(msg)
                 delay += 3
                 time.sleep(3)

jms/terminal.py

@@ -71,12 +71,12 @@ def register_terminal_v2(self, name, token, comment="Coco"):
             return terminal
         else:
             msg = resp.content.decode()
-            if msg.find("unique") >= 0:
-                msg = "The name have been used: {}".format(name)
+            if msg.find("unique"):
+                msg = "The name have been used: {} {}".format(name, msg)
             logger.error(msg)
             return None
 
-    def terminal_heartbeat(self, sessions):
+    def terminal_heartbeat(self, data):
         """和Jumpserver维持心跳, 当Terminal断线后,jumpserver可以知晓
 
         :return tasks that this terminal need handle
@@ -93,24 +93,6 @@ def terminal_heartbeat(self, sessions):
             "session_online": 10
         }
         """
-        p = psutil.Process(os.getpid())
-        cpu_used = p.cpu_percent(interval=1.0)
-        memory_used = int(p.memory_info().rss / 1024 / 1024)
-        connections = len(p.connections())
-        threads = p.num_threads()
-        session_online = len([s for s in sessions if not s["is_finished"]])
-        # logger.debug("CPU: {} MEM: {}M CONN: {} THRE: {} SESS: {}".format(
-        #     cpu_used, memory_used, connections, threads, session_online
-        # ))
-        data = {
-            "cpu_used": cpu_used,
-            "memory_used": memory_used,
-            "connections": connections,
-            "threads": threads,
-            "boot_time": p.create_time(),
-            "session_online": session_online,
-            "sessions": sessions,
-        }
         try:
             resp = self.http.post('terminal-heartbeat', data=data, use_auth=True)
         except (ResponseError, RequestError) as e: