fix: Haproxy check should not throw error

This commit is contained in:
Andras Bacsai
2022-02-11 15:11:10 +01:00
parent 8974de165f
commit 5c646c1898

View File

@@ -106,7 +106,11 @@ export async function forceSSLOffApplication({ domain }) {
export async function forceSSLOnApplication({ domain }) { export async function forceSSLOnApplication({ domain }) {
if (!dev) { if (!dev) {
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();
try {
await checkHAProxy(haproxy); await checkHAProxy(haproxy);
} catch (error) {
return;
}
const transactionId = await getNextTransactionId(); const transactionId = await getNextTransactionId();
try { try {
@@ -278,7 +282,11 @@ export async function reloadHaproxy(engine) {
} }
export async function configureProxyForApplication({ domain, imageId, applicationId, port }) { export async function configureProxyForApplication({ domain, imageId, applicationId, port }) {
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();
try {
await checkHAProxy(haproxy); await checkHAProxy(haproxy);
} catch (error) {
return;
}
let serverConfigured = false; let serverConfigured = false;
let backendAvailable: any = null; let backendAvailable: any = null;
@@ -358,7 +366,11 @@ export async function configureProxyForApplication({ domain, imageId, applicatio
export async function configureCoolifyProxyOff({ domain }) { export async function configureCoolifyProxyOff({ domain }) {
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();
try {
await checkHAProxy(haproxy); await checkHAProxy(haproxy);
} catch (error) {
return;
}
try { try {
const transactionId = await getNextTransactionId(); const transactionId = await getNextTransactionId();
@@ -388,7 +400,11 @@ export async function checkHAProxy(haproxy) {
} }
export async function configureCoolifyProxyOn({ domain }) { export async function configureCoolifyProxyOn({ domain }) {
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();
try {
await checkHAProxy(haproxy); await checkHAProxy(haproxy);
} catch (error) {
return;
}
let serverConfigured = false; let serverConfigured = false;
let backendAvailable: any = null; let backendAvailable: any = null;
try { try {
@@ -627,12 +643,15 @@ export async function configureSimpleServiceProxyOn({ id, domain, port }) {
export async function configureSimpleServiceProxyOff({ domain }) { export async function configureSimpleServiceProxyOff({ domain }) {
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();
try {
await checkHAProxy(haproxy); await checkHAProxy(haproxy);
} catch (error) {
return;
}
try { try {
await haproxy.get(`v2/services/haproxy/configuration/backends/${domain}`).json(); await haproxy.get(`v2/services/haproxy/configuration/backends/${domain}`).json();
const transactionId = await getNextTransactionId(); const transactionId = await getNextTransactionId();
await haproxy await haproxy
.delete(`v2/services/haproxy/configuration/backends/${domain}`, { .delete(`v2/services/haproxy/configuration/backends/${domain}`, {
searchParams: { searchParams: {