From f0e16d0a60738e8598ee83ebc5a7436fe92bab54 Mon Sep 17 00:00:00 2001
From: sangge <2251250136@qq.com>
Date: Tue, 24 Oct 2023 20:01:56 +0800
Subject: [PATCH 1/2] test: tpem test

---
 doc/README_app_en.md | 2 +-
 src/node.py          | 2 +-
 src/server.py        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/README_app_en.md b/doc/README_app_en.md
index 29dea14..420d7a3 100644
--- a/doc/README_app_en.md
+++ b/doc/README_app_en.md
@@ -7,7 +7,7 @@ get method
 pr  
 
 
-docker run --rm -it -p 8000:8000 -p 8001:8001 -p 8002:8002 -v ~/tpre:/app -e HOST_IP=110.41.130.197 git.mamahaha.work/sangge/tpre:base bash  
+docker run --rm -it -p 8000:8000 -p 8001:8001 -p 8002:8002 -v ~/mimajingsai:/app -e HOST_IP=110.41.130.197 git.mamahaha.work/sangge/tpre:base bash  
 
 110.41.155.96 tpre1  
 110.41.130.197 tpre2  
diff --git a/src/node.py b/src/node.py
index 6d71ff2..510a55f 100644
--- a/src/node.py
+++ b/src/node.py
@@ -16,7 +16,7 @@ async def lifespan(app: FastAPI):
 
 
 app = FastAPI(lifespan=lifespan)
-server_address = "http://10.20.14.232:8000/server"
+server_address = "http://110.41.155.96:8000/server"
 id = 0
 ip = ""
 client_ip_src = ""  # 发送信息用户的ip
diff --git a/src/server.py b/src/server.py
index 18d6214..46b0fbf 100644
--- a/src/server.py
+++ b/src/server.py
@@ -96,8 +96,8 @@ async def receive_heartbeat_internal():
     while 1:
         timeout = 7
         # 删除超时的节点
-        # cursor.execute("DELETE FROM nodes WHERE last_heartbeat < ?", (time.time() - timeout,))
-        # conn.commit()
+        cursor.execute("DELETE FROM nodes WHERE last_heartbeat < ?", (time.time() - timeout,))
+        conn.commit()
         await asyncio.sleep(timeout)
 
 @app.get("/server/send_nodes_list")

From 1fcdf20afb5f86d2404df2db983c71265d8cb51f Mon Sep 17 00:00:00 2001
From: sangge <2251250136@qq.com>
Date: Tue, 24 Oct 2023 20:10:24 +0800
Subject: [PATCH 2/2] test: update test

---
 src/client.py | 4 ++--
 src/node.py   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client.py b/src/client.py
index 7ecbdb2..a3d679c 100644
--- a/src/client.py
+++ b/src/client.py
@@ -311,8 +311,8 @@ async def recieve_request(i_m: IP_Message):
 
 
 def get_own_ip() -> str:
-    hostname = socket.gethostname()
-    ip = socket.gethostbyname(hostname)
+    
+    ip = os.environ.get("HOST_IP", "IP not set")
     return ip
 
 
diff --git a/src/node.py b/src/node.py
index b4e0066..d75b1f9 100644
--- a/src/node.py
+++ b/src/node.py
@@ -108,4 +108,4 @@ async def send_user_des_message(source_ip: str, dest_ip: str, re_message):  # 
 if __name__ == "__main__":
     import uvicorn  # pylint: disable=e0401
 
-    uvicorn.run("node:app", host="0.0.0.0", port=8001, reload=True)
+    uvicorn.run("node:app", host="0.0.0.0", port=8001, reload=False)