diff --git a/doc/README_app_en.md b/doc/README_app_en.md index 29dea14..88141d1 100644 --- a/doc/README_app_en.md +++ b/doc/README_app_en.md @@ -7,7 +7,11 @@ 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 + + +tpre3: docker run --rm -it -p 8000:8000 -p 8001:8001 -p 8002:8002 -v ~/mimajingsai:/app -e HOST_IP=110.41.21.35 git.mamahaha.work/sangge/tpre:base bash + 110.41.155.96 tpre1 110.41.130.197 tpre2 diff --git a/src/client.ini b/src/client.ini index 23e21d2..cd80a83 100644 --- a/src/client.ini +++ b/src/client.ini @@ -1,3 +1,3 @@ [settings] -server_address = 10.20.14.232:8000 +server_address = 110.41.155.96:8000 version = 1.0 diff --git a/src/client.py b/src/client.py index 915f182..f3e757c 100644 --- a/src/client.py +++ b/src/client.py @@ -326,15 +326,15 @@ 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 # get node list from central server def get_node_list(count: int, server_addr: str): url = "http://" + server_addr + "/server/send_nodes_list?count=" + str(count) - response = requests.get(url) + response = requests.get(url,timeout=3) # Checking the response if response.status_code == 200: print("Success get node list") diff --git a/src/node.py b/src/node.py index 4ee9231..d77460e 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) diff --git a/src/server.py b/src/server.py index 7e37db5..6060f17 100644 --- a/src/server.py +++ b/src/server.py @@ -112,8 +112,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)