main #22

Merged
ccyj merged 68 commits from sangge/tpre-python:main into main 2023-10-26 14:45:47 +08:00
5 changed files with 12 additions and 8 deletions
Showing only changes of commit 40fd8945c8 - Show all commits

View File

@ -7,7 +7,11 @@ get method
pr 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.155.96 tpre1
110.41.130.197 tpre2 110.41.130.197 tpre2

View File

@ -1,3 +1,3 @@
[settings] [settings]
server_address = 10.20.14.232:8000 server_address = 110.41.155.96:8000
version = 1.0 version = 1.0

View File

@ -326,15 +326,15 @@ async def recieve_request(i_m: IP_Message):
def get_own_ip() -> str: def get_own_ip() -> str:
hostname = socket.gethostname()
ip = socket.gethostbyname(hostname) ip = os.environ.get("HOST_IP", "IP not set")
return ip return ip
# get node list from central server # get node list from central server
def get_node_list(count: int, server_addr: str): def get_node_list(count: int, server_addr: str):
url = "http://" + server_addr + "/server/send_nodes_list?count=" + str(count) url = "http://" + server_addr + "/server/send_nodes_list?count=" + str(count)
response = requests.get(url) response = requests.get(url,timeout=3)
# Checking the response # Checking the response
if response.status_code == 200: if response.status_code == 200:
print("Success get node list") print("Success get node list")

View File

@ -108,4 +108,4 @@ async def send_user_des_message(source_ip: str, dest_ip: str, re_message): #
if __name__ == "__main__": if __name__ == "__main__":
import uvicorn # pylint: disable=e0401 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)

View File

@ -112,8 +112,8 @@ async def receive_heartbeat_internal():
while 1: while 1:
timeout = 7 timeout = 7
# 删除超时的节点 # 删除超时的节点
# cursor.execute("DELETE FROM nodes WHERE last_heartbeat < ?", (time.time() - timeout,)) cursor.execute("DELETE FROM nodes WHERE last_heartbeat < ?", (time.time() - timeout,))
# conn.commit() conn.commit()
await asyncio.sleep(timeout) await asyncio.sleep(timeout)