From 734354ce47ec653b5fa653badd940f046fc5f380 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Wed, 11 Sep 2024 20:18:06 +0200 Subject: [PATCH 1/5] hotfix(utils.mjs) use the old stats website temporarily --- plugins/gatsby-source-jenkinsplugins/utils.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/gatsby-source-jenkinsplugins/utils.mjs b/plugins/gatsby-source-jenkinsplugins/utils.mjs index 924d5e11a..bffdb1566 100644 --- a/plugins/gatsby-source-jenkinsplugins/utils.mjs +++ b/plugins/gatsby-source-jenkinsplugins/utils.mjs @@ -434,13 +434,13 @@ export const fetchSiteInfo = async ({createNode, reporter}) => { export const fetchStats = async ({reporter, stats}) => { const timeSpan = 12; - const totalUrl = 'https://stats.jenkins.io/jenkins-stats/svg/total-jenkins.csv'; + const totalUrl = 'https://old.stats.jenkins.io/jenkins-stats/svg/total-jenkins.csv'; const totalInstalls = (await requestGET({url: totalUrl, reporter})).trim().split('\n'); stats.core = {installations: []}; const timestamps = []; for (let monthsAgo = 1; monthsAgo <= timeSpan; monthsAgo++) { const [month, coreInstalls] = csvParse(totalInstalls[totalInstalls.length - monthsAgo]); - const pluginInstallsUrl = `https://stats.jenkins.io/jenkins-stats/svg/${month}-plugins.csv`; + const pluginInstallsUrl = `https://old.stats.jenkins.io/jenkins-stats/svg/${month}-plugins.csv`; const timestamp = Date.parse(`${month}`.replace(/(..)$/, '-$1')); timestamps.push(timestamp); const pluginInstalls = (await requestGET({url: pluginInstallsUrl, reporter})).split('\n'); From 89c4d7d7e876b7cd4b248a5fd4f46dc6991c8f37 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Wed, 11 Sep 2024 21:24:49 +0200 Subject: [PATCH 2/5] Update utils.mjs --- plugins/gatsby-source-jenkinsplugins/utils.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gatsby-source-jenkinsplugins/utils.mjs b/plugins/gatsby-source-jenkinsplugins/utils.mjs index bffdb1566..3350bbece 100644 --- a/plugins/gatsby-source-jenkinsplugins/utils.mjs +++ b/plugins/gatsby-source-jenkinsplugins/utils.mjs @@ -30,7 +30,7 @@ const requestGET = async ({url, reporter}) => { try { const results = await axios.get(url); - if (results.status !== 200) { + if (results.status >= 400) { throw results.data; } return results.data; From 5230f59c1cc8b245dc2cc2b6b389320886dc1402 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Wed, 11 Sep 2024 21:30:39 +0200 Subject: [PATCH 3/5] Update utils.mjs --- plugins/gatsby-source-jenkinsplugins/utils.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gatsby-source-jenkinsplugins/utils.mjs b/plugins/gatsby-source-jenkinsplugins/utils.mjs index 3350bbece..bffdb1566 100644 --- a/plugins/gatsby-source-jenkinsplugins/utils.mjs +++ b/plugins/gatsby-source-jenkinsplugins/utils.mjs @@ -30,7 +30,7 @@ const requestGET = async ({url, reporter}) => { try { const results = await axios.get(url); - if (results.status >= 400) { + if (results.status !== 200) { throw results.data; } return results.data; From 5489791cab593aaeec9fcff398d3f2871a3ccb4c Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Wed, 11 Sep 2024 21:37:40 +0200 Subject: [PATCH 4/5] wip: Gavin suggestion --- plugins/gatsby-source-jenkinsplugins/utils.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gatsby-source-jenkinsplugins/utils.mjs b/plugins/gatsby-source-jenkinsplugins/utils.mjs index bffdb1566..acd386625 100644 --- a/plugins/gatsby-source-jenkinsplugins/utils.mjs +++ b/plugins/gatsby-source-jenkinsplugins/utils.mjs @@ -29,7 +29,7 @@ const requestGET = async ({url, reporter}) => { activity.start(); try { - const results = await axios.get(url); + const results = await axios.get(url, { maxRedirects: 10 }); if (results.status !== 200) { throw results.data; } From 25595263f0c0ca63390452f5bc6a9823cb66747d Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Thu, 12 Sep 2024 08:33:20 +0200 Subject: [PATCH 5/5] revert --- plugins/gatsby-source-jenkinsplugins/utils.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gatsby-source-jenkinsplugins/utils.mjs b/plugins/gatsby-source-jenkinsplugins/utils.mjs index acd386625..bffdb1566 100644 --- a/plugins/gatsby-source-jenkinsplugins/utils.mjs +++ b/plugins/gatsby-source-jenkinsplugins/utils.mjs @@ -29,7 +29,7 @@ const requestGET = async ({url, reporter}) => { activity.start(); try { - const results = await axios.get(url, { maxRedirects: 10 }); + const results = await axios.get(url); if (results.status !== 200) { throw results.data; }