fix

src/lib/haproxy/configuration.ts

@@ -113,6 +113,7 @@ export async function haproxyInstance() {
 }
 
 export async function configureHAProxy() {
+	try {
 		const haproxy = await haproxyInstance();
 		await checkHAProxy(haproxy);
 		const data = {
@@ -128,11 +129,15 @@ export async function configureHAProxy() {
 				fqdn,
 				id,
 				port,
-			destinationDocker: { engine, network },
+				destinationDocker,
+				destinationDockerId,
 				settings: { previews },
 				updatedAt
 			} = application;
+			if (destinationDockerId) {
+				const { engine, network } = destinationDocker;
 				const isRunning = await checkContainer(engine, id);
+				if (fqdn) {
 					const domain = getDomain(fqdn);
 					const isHttps = fqdn.startsWith('https://');
 					const isWWW = fqdn.includes('www.');
@@ -176,6 +181,8 @@ export async function configureHAProxy() {
 						}
 					}
 				}
+			}
+		}
 		const services = await db.prisma.service.findMany({
 			include: {
 				destinationDocker: true,
@@ -187,18 +194,15 @@ export async function configureHAProxy() {
 		});
 
 		for (const service of services) {
-		const {
-			fqdn,
-			id,
-			type,
-			destinationDocker: { engine },
-			updatedAt
-		} = service;
+			const { fqdn, id, type, destinationDocker, destinationDockerId, updatedAt } = service;
+			if (destinationDockerId) {
+				const { engine } = destinationDocker;
 				const found = db.supportedServiceTypesAndVersions.find((a) => a.name === type);
 				if (found) {
 					const port = found.ports.main;
 					const publicPort = service[type]?.publicPort;
 					const isRunning = await checkContainer(engine, id);
+					if (fqdn) {
 						const domain = getDomain(fqdn);
 						const isHttps = fqdn.startsWith('https://');
 						const isWWW = fqdn.includes('www.');
@@ -218,6 +222,8 @@ export async function configureHAProxy() {
 						}
 					}
 				}
+			}
+		}
 		const { fqdn, updatedAt } = await db.prisma.setting.findFirst();
 		if (fqdn) {
 			const domain = getDomain(fqdn);
@@ -231,12 +237,13 @@ export async function configureHAProxy() {
 				isHttps,
 				redirectValue,
 				redirectTo: isWWW ? domain : 'www.' + domain,
-			updatedAt
+				updatedAt: updatedAt.getTime()
 			});
 		}
 		const output = mustache.render(template, data);
 		const newHash = crypto.createHash('md5').update(output).digest('hex');
 		const { proxyHash, id } = await db.listSettings();
+		console.log({ proxyHash, newHash, output });
 		if (proxyHash !== newHash) {
 			await db.prisma.setting.update({ where: { id }, data: { proxyHash: newHash } });
 			console.log('HAProxy configuration changed, updating...');
@@ -250,6 +257,9 @@ export async function configureHAProxy() {
 				}
 			});
 		} else {
-		// console.log('HAProxy configuration is up to date');
+			console.log('HAProxy configuration is up to date');
+		}
+	} catch (error) {
+		throw error;
 	}
 }

src/lib/haproxy/index.ts

@@ -70,7 +70,7 @@ export async function deleteProxy({ id }) {
 			})
 			.json();
 	} catch (error) {
-		console.log(error.response.body);
+		console.log(error.response?.body || error);
 	} finally {
 		if (transactionId) await completeTransaction(transactionId);
 	}

src/lib/queues/proxy.ts

@@ -1,3 +1,4 @@
+import { dev } from '$app/env';
 import { ErrorHandler } from '$lib/database';
 import { configureHAProxy } from '$lib/haproxy/configuration';
 
@@ -5,6 +6,7 @@ export default async function () {
 	try {
 		return await configureHAProxy();
 	} catch (error) {
-		ErrorHandler(error.response.body || error);
+		console.log(error.response?.body || error);
+		return ErrorHandler(error.response?.body || error);
 	}
 }