nathanwoodburn/hnsdoh-status
nathanwoodburn/hnsdoh-status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Update summary function to correctly get last down time
All checks were successful
Build Docker / BuildImage (push) Successful in 36s
Details

Browse Source
This commit is contained in:
Nathan Woodburn 2024-10-17 15:25:36 +11:00
parent b9abf80d2f
commit 7e1ceecd0c
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server.py
View File

@ -115,7 +115,6 @@ def faviconPNG():
@app.route("/.well-known/<path:path>") @app.route("/.well-known/<path:path>")
def wellknown(path): def wellknown(path):
# Try to proxy to https://nathan.woodburn.au/.well-known/
req = requests.get(f"https://nathan.woodburn.au/.well-known/{path}") req = requests.get(f"https://nathan.woodburn.au/.well-known/{path}")
return make_response( return make_response(
req.content, 200, {"Content-Type": req.headers["Content-Type"]} req.content, 200, {"Content-Type": req.headers["Content-Type"]}
@ -140,6 +139,8 @@ def get_node_list() -> list:
if node not in ips: if node not in ips:
print(f"Adding manual node: {node}", flush=True) print(f"Adding manual node: {node}", flush=True)
ips.append(node) ips.append(node)
else:
print(f"Skipping manual node: {node}", flush=True)
return ips return ips
@ -535,6 +536,7 @@ def log_status(node_status: list):
with open(filename, "w") as file: with open(filename, "w") as file:
json.dump(data, file, indent=4) json.dump(data, file, indent=4)
print("Logged status", flush=True)
# endregion # endregion
@ -604,9 +606,11 @@ def summarize_history(history: list) -> dict:
# Update last downtime for each key # Update last downtime for each key
for key in ["plain_dns", "doh", "dot"]: for key in ["plain_dns", "doh", "dot"]:
if node.get(key) == False: if node.get(key) == False:
nodes_status[ip][key]["last_down"] = date.strftime( # Check if the last downtime is more recent
"%Y-%m-%d %H:%M:%S" if nodes_status[ip][key]["last_down"] == "Never":
) nodes_status[ip][key]["last_down"] = date.strftime("%Y-%m-%d %H:%M:%S")
elif date > datetime.strptime(nodes_status[ip][key]["last_down"], "%Y-%m-%d %H:%M:%S"):
nodes_status[ip][key]["last_down"] = date.strftime("%Y-%m-%d %H:%M:%S")
# Calculate percentages and prepare final summary # Calculate percentages and prepare final summary
node_list = [] node_list = []