feat: add logger for logging
All checks were successful
Test CI / test speed (push) Successful in 15s

This commit is contained in:
sangge 2023-11-28 17:38:42 +08:00
parent 8eee25500c
commit 6e482caf8d

View File

@ -8,6 +8,7 @@ from tpre import *
import os import os
from typing import Any, Tuple from typing import Any, Tuple
import base64 import base64
import logging
@asynccontextmanager @asynccontextmanager
@ -25,6 +26,9 @@ client_ip_src = "" # 发送信息用户的ip
client_ip_des = "" # 接收信息用户的ip client_ip_des = "" # 接收信息用户的ip
processed_message = () # 重加密后的数据 processed_message = () # 重加密后的数据
logger = logging.getLogger("uvicorn")
# class C(BaseModel): # class C(BaseModel):
# Tuple: Tuple[capsule, int] # Tuple: Tuple[capsule, int]
# ip_src: str # ip_src: str
@ -36,6 +40,7 @@ def send_ip():
# ip = get_local_ip() # type: ignore # ip = get_local_ip() # type: ignore
global id global id
id = requests.get(url, timeout=3) id = requests.get(url, timeout=3)
logger.info(f"中心服务器返回节点ID为: {id}")
print("中心服务器返回节点ID为: ", id) print("中心服务器返回节点ID为: ", id)
@ -57,7 +62,7 @@ def get_local_ip():
def init(): def init():
get_local_ip() get_local_ip()
send_ip() send_ip()
task = asyncio.create_task(send_heartbeat_internal()) asyncio.create_task(send_heartbeat_internal())
print("Finish init") print("Finish init")
@ -75,11 +80,12 @@ async def send_heartbeat_internal() -> None:
while True: while True:
# print('successful send my_heart') # print('successful send my_heart')
try: try:
folderol = requests.get(url, timeout=3) requests.get(url, timeout=3)
except: except:
logger.error("Central server error")
print("Central server error") print("Central server error")
# 删除超时的节点(假设你有一个异步的数据库操作函数) # 删除超时的节点
await asyncio.sleep(timeout) await asyncio.sleep(timeout)
@ -106,6 +112,7 @@ async def user_src(message: Req):
"rk": rk_list[i], "rk": rk_list[i],
} }
""" """
logger.info(f"node: {message}")
print("node: ", message) print("node: ", message)
source_ip = message.source_ip source_ip = message.source_ip
dest_ip = message.dest_ip dest_ip = message.dest_ip
@ -116,11 +123,18 @@ async def user_src(message: Req):
capsule_ct = (capsule, ct.to_bytes(byte_length)) capsule_ct = (capsule, ct.to_bytes(byte_length))
rk = message.rk rk = message.rk
logger.info(f"Computed capsule_ct: {capsule_ct}")
print(f"Computed capsule_ct: {capsule_ct}") print(f"Computed capsule_ct: {capsule_ct}")
a, b = ReEncrypt(rk, capsule_ct)
a, b = ReEncrypt(rk, capsule_ct) # type: ignore
processed_message = (a, int.from_bytes(b)) processed_message = (a, int.from_bytes(b))
logger.info(f"Re-encrypted message: {processed_message}")
print(f"Re-encrypted message: {processed_message}") print(f"Re-encrypted message: {processed_message}")
await send_user_des_message(source_ip, dest_ip, processed_message) await send_user_des_message(source_ip, dest_ip, processed_message)
logger.info("Message sent to destination user.")
print("Message sent to destination user.") print("Message sent to destination user.")
return HTTPException(status_code=200, detail="message recieved") return HTTPException(status_code=200, detail="message recieved")
@ -132,6 +146,8 @@ async def send_user_des_message(source_ip: str, dest_ip: str, re_message): #
response = requests.post( response = requests.post(
"http://" + dest_ip + ":8002" + "/receive_messages", json=data "http://" + dest_ip + ":8002" + "/receive_messages", json=data
) )
logger.info(f"send stauts: {response.text}")
print("send stauts:", response.text) print("send stauts:", response.text)