From 3a252509d050c0d7cf1091574050ba9de4544e13 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 14 Apr 2022 15:04:18 +0200 Subject: [PATCH] fix: Add HTTP proxy checks --- src/lib/haproxy/index.ts | 8 ++++---- src/lib/queues/proxyTcpHttp.ts | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/lib/haproxy/index.ts b/src/lib/haproxy/index.ts index 618d410d5..9aa3797b4 100644 --- a/src/lib/haproxy/index.ts +++ b/src/lib/haproxy/index.ts @@ -127,10 +127,10 @@ export async function startTcpProxy( const containerName = `haproxy-for-${publicPort}`; const found = await checkContainer(engine, containerName); - const foundDB = await checkContainer(engine, id); + const foundDependentContainer = await checkContainer(engine, id); try { - if (foundDB && !found) { + if (foundDependentContainer && !found) { const { stdout: Config } = await asyncExecShell( `DOCKER_HOST="${host}" docker network inspect bridge --format '{{json .IPAM.Config }}'` ); @@ -157,10 +157,10 @@ export async function startHttpProxy( const containerName = `haproxy-for-${publicPort}`; const found = await checkContainer(engine, containerName); - const foundDB = await checkContainer(engine, id); + const foundDependentContainer = await checkContainer(engine, id); try { - if (foundDB && !found) { + if (foundDependentContainer && !found) { const { stdout: Config } = await asyncExecShell( `DOCKER_HOST="${host}" docker network inspect bridge --format '{{json .IPAM.Config }}'` ); diff --git a/src/lib/queues/proxyTcpHttp.ts b/src/lib/queues/proxyTcpHttp.ts index 00b5d759e..f9c509587 100644 --- a/src/lib/queues/proxyTcpHttp.ts +++ b/src/lib/queues/proxyTcpHttp.ts @@ -1,11 +1,12 @@ import { ErrorHandler, generateDatabaseConfiguration, prisma } from '$lib/database'; -import { checkContainer, startTcpProxy } from '$lib/haproxy'; +import { startHttpProxy, startTcpProxy } from '$lib/haproxy'; export default async function (): Promise { try { + // TCP Proxies const databasesWithPublicPort = await prisma.database.findMany({ where: { publicPort: { not: null } }, include: { settings: true, destinationDocker: true } @@ -28,6 +29,19 @@ export default async function (): Promise