Tucan444/Mabasej_Team
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Development' of https://github.com/Tucan444/Mabasej_Team into Development

Browse Source
This commit is contained in:
Benjamín 2021-03-05 19:12:52 +01:00
commit cd4e179394
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.py
View File

@ -44,8 +44,8 @@ def heartbeat(s_table: Server_table, request: Request):
try: try:
for position, server_id in enumerate(s_table.ID): for position, server_id in enumerate(s_table.ID):
if server_id in heartbeat_table["ID"]: if server_id in heartbeat_table["ID"]:
if heartbeat_table["last_heartbeat"][heartbeat_table["ID"].index(server_id)] > s_table.last_heartbeat[ if heartbeat_table["last_heartbeat"][heartbeat_table["ID"].index(server_id)] > \
position]: s_table.last_heartbeat[position]:
heartbeat_table["last_heartbeat"][heartbeat_table["ID"].index(server_id)] = s_table.last_heartbeat[ heartbeat_table["last_heartbeat"][heartbeat_table["ID"].index(server_id)] = s_table.last_heartbeat[
position] position]
else: else:
@ -64,3 +64,15 @@ def get_sensors(request: Request):
log.message(f"sensor data sent to {request.client.host}:{request.client.port}") log.message(f"sensor data sent to {request.client.host}:{request.client.port}")
log.debug(f"sensor data: {sensors}") log.debug(f"sensor data: {sensors}")
return sensors return sensors
@app.get("/files/{file}")
def get_file(file: str):
pass
def send_heartbeat(server_table, ID, files_table):
pass
while True:
for server in heartbeat_table["IP"]: