Merge pull request 'main' (#26) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#26
This commit is contained in:
commit
0e3ecd475a
@ -83,6 +83,9 @@ def init_config():
|
||||
|
||||
# execute on exit
|
||||
def clean_env():
|
||||
with sqlite3.connect("client.db") as db:
|
||||
db.execute("DELETE FROM node")
|
||||
db.commit()
|
||||
print("Exit app")
|
||||
|
||||
|
||||
@ -230,7 +233,7 @@ async def request_message(i_m: Request_Message):
|
||||
# dest_ip = dest_ip.split(":")[0]
|
||||
message_name = i_m.message_name
|
||||
source_ip = get_own_ip()
|
||||
dest_port = "8003"
|
||||
dest_port = "8002"
|
||||
url = "http://" + dest_ip + ":" + dest_port + "/recieve_request?i_m"
|
||||
payload = {
|
||||
"dest_ip": dest_ip,
|
||||
@ -239,7 +242,8 @@ async def request_message(i_m: Request_Message):
|
||||
"pk": pk,
|
||||
}
|
||||
try:
|
||||
response = requests.post(url, json=payload)
|
||||
response = requests.post(url, json=payload, timeout=3)
|
||||
|
||||
except:
|
||||
print("can't post")
|
||||
return {"message": "can't post"}
|
||||
@ -263,6 +267,7 @@ async def request_message(i_m: Request_Message):
|
||||
data = response.json()
|
||||
public_key = int(data["public_key"])
|
||||
threshold = int(data["threshold"])
|
||||
print(data)
|
||||
with sqlite3.connect("client.db") as db:
|
||||
db.execute(
|
||||
"""
|
||||
@ -278,7 +283,7 @@ async def request_message(i_m: Request_Message):
|
||||
return {"message": "Database Error"}
|
||||
|
||||
# wait 10s to recieve message from nodes
|
||||
for _ in range(10):
|
||||
for _ in range(3):
|
||||
if node_response:
|
||||
data = message
|
||||
|
||||
|
@ -2,7 +2,7 @@ import argparse
|
||||
import requests
|
||||
|
||||
def send_post_request(ip_addr, message_name):
|
||||
url = f"http://localhost:20234/request_message/?i_m"
|
||||
url = f"http://localhost:8002/request_message/?i_m"
|
||||
data = {
|
||||
"dest_ip": ip_addr,
|
||||
"message_name": message_name
|
||||
|
Loading…
x
Reference in New Issue
Block a user