From 50e02e1d86ec3ee0b342be1ba9a843f1c2263ad2 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Wed, 28 Aug 2024 15:26:38 +0200 Subject: [PATCH] Update status badges for Anaconda.org (#2278) --- src/components/StatusDashboard/repos_and_bots.jsx | 6 +++--- src/constants.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/StatusDashboard/repos_and_bots.jsx b/src/components/StatusDashboard/repos_and_bots.jsx index 0594699e43..9aede6fd39 100644 --- a/src/components/StatusDashboard/repos_and_bots.jsx +++ b/src/components/StatusDashboard/repos_and_bots.jsx @@ -57,12 +57,12 @@ function Image({ alt, link, children }) { } function CDNStatus() { - const [{ minutes, status }, setState] = useState({ minutes: 0, status: "…" }); + const [{ minutes, status }, setState] = useState({ minutes: "…", status: "…" }); useEffect(() => { void (async () => { try { - const response = await (await fetch(urls.repos.cdn.api)).text(); - const updated = new Date(response.trim()).getTime(); + const response = await (await fetch(`${urls.repos.cdn.api}?bustcache=${Date.now()}`)).json(); + const updated = new Date(response.timestamp.iso8601).getTime(); const delta = (new Date()).getTime() - updated; const status = delta < OPERATIONAL_WINDOW ? "operational" : delta < DEGRADED_WINDOW ? "degraded" : "major outage"; diff --git a/src/constants.js b/src/constants.js index 2f30ae7d6d..cc44f7d6a3 100644 --- a/src/constants.js +++ b/src/constants.js @@ -126,8 +126,8 @@ export const urls = { }, ], cdn: { - api: "https://s3.amazonaws.com/conda-static.anaconda.org/conda-forge/last-updated", - link: "https://conda-static.anaconda.org/conda-forge/rss.xml", + api: "https://conda.anaconda.org/conda-forge/last-updated.json", + link: "https://conda.anaconda.org/conda-forge/rss.xml", }, services: { api: "https://conda-forge.herokuapp.com/alive",