From e669c681e29e4b757cf7c593ad6878c985011827 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 25 Mar 2020 12:39:42 +0000 Subject: [PATCH] Fetch both config.json-s at the same time, first one fails 99% of the time Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/getconfig.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vector/getconfig.js b/src/vector/getconfig.js index 6fb74d38ef..c0f81f6cca 100644 --- a/src/vector/getconfig.js +++ b/src/vector/getconfig.js @@ -21,15 +21,19 @@ import request from 'browser-request'; export async function getVectorConfig(relativeLocation) { if (relativeLocation === undefined) relativeLocation = ''; if (relativeLocation !== '' && !relativeLocation.endsWith('/')) relativeLocation += '/'; + + const specificConfigPromise = getConfig(`${relativeLocation}config.${document.domain}.json`); + const generalConfigPromise = getConfig(relativeLocation + "config.json"); + try { - const configJson = await getConfig(`${relativeLocation}config.${document.domain}.json`); + const configJson = await specificConfigPromise; // 404s succeed with an empty json config, so check that there are keys if (Object.keys(configJson).length === 0) { throw new Error(); // throw to enter the catch } return configJson; } catch (e) { - return await getConfig(relativeLocation + "config.json"); + return await generalConfigPromise; } }