From 573ebec0a4f417856d24801c3c7aeeea0ccb67f7 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Mon, 22 Aug 2022 12:39:09 -0400 Subject: [PATCH] *Don't retry on boot, but catch any retry failures --- src/relay.ts | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/relay.ts b/src/relay.ts index 08b49c3..5a7522a 100644 --- a/src/relay.ts +++ b/src/relay.ts @@ -118,19 +118,24 @@ async function setupSSl(bootup: boolean) { let domainValid = false; let dateValid = false; let configDomain = config.str("domain"); - await promiseRetry(async (retry: any) => { - sslCert = await getSslCert(); - if (!sslCert) { - retry(); - } - }); - await promiseRetry(async (retry: any) => { - sslKey = await getSslCert(); - if (!sslKey) { - retry(); - } - }); + let retryOptions = bootup ? {} : { retry: 0 }; + + try { + await promiseRetry(async (retry: any) => { + sslCert = await getSslCert(); + if (!sslCert) { + retry(); + } + }, retryOptions); + + await promiseRetry(async (retry: any) => { + sslKey = await getSslCert(); + if (!sslKey) { + retry(); + } + }, retryOptions); + } catch {} if (sslCert && sslKey) { sslParams.cert = Buffer.from((sslCert as IndependentFileSmall).fileData);