fix: do not run cleanup and build parallel

fix: UI error toasts

apps/api/src/index.ts

@@ -106,23 +106,30 @@ fastify.listen({ port, host }, async (err: any, address: any) => {
 	await scheduler.start('cleanupStorage');
 	await scheduler.start('checkProxies')
 
-	// Check if no build is running, try to autoupdate.
+	// Check if no build is running
+
+	// Check for update
 	setInterval(async () => {
 		const { isAutoUpdateEnabled } = await prisma.setting.findFirst();
 		if (isAutoUpdateEnabled) {
 			if (scheduler.workers.has('deployApplication')) {
-				scheduler.workers.get('deployApplication').postMessage("status");
+				scheduler.workers.get('deployApplication').postMessage("status:autoUpdater");
 			}
 		}
-	}, 30000 * 10)
+	}, 60000 * 15)
+
+	// Cleanup storage
+	setInterval(async () => {
+		if (scheduler.workers.has('deployApplication')) {
+			scheduler.workers.get('deployApplication').postMessage("status:cleanupStorage");
+		}
+	}, 60000 * 10)
 
 	scheduler.on('worker deleted', async (name) => {
-		if (name === 'autoUpdater') {
-			await scheduler.start('deployApplication');
+		if (name === 'autoUpdater' || name === 'cleanupStorage') {
+			if (!scheduler.workers.has('deployApplication')) await scheduler.start('deployApplication');
 		}
-
 	});
-
 });
 
 async function initServer() {

apps/api/src/jobs/deployApplication.ts

@@ -4,7 +4,7 @@ import fs from 'fs/promises';
 import yaml from 'js-yaml';
 
 import { copyBaseConfigurationFiles, makeLabelForStandaloneApplication, saveBuildLog, setDefaultConfiguration } from '../lib/buildPacks/common';
-import { asyncExecShell, createDirectories, decrypt, getDomain, prisma } from '../lib/common';
+import { asyncExecShell,  createDirectories, decrypt, getDomain, prisma } from '../lib/common';
 import { dockerInstance, getEngine } from '../lib/docker';
 import * as importers from '../lib/importers';
 import * as buildpacks from '../lib/buildPacks';
@@ -21,8 +21,12 @@ import * as buildpacks from '../lib/buildPacks';
 					parentPort.postMessage('cancelled');
 					return;
 				}
-				if (message === 'status') {
-					parentPort.postMessage({ size: queue.size, pending: queue.pending });
+				if (message === 'status:autoUpdater') {
+					parentPort.postMessage({ size: queue.size, pending: queue.pending, caller: 'autoUpdater' });
+					return;
+				}
+				if (message === 'status:cleanupStorage') {
+					parentPort.postMessage({ size: queue.size, pending: queue.pending, caller: 'cleanupStorage' });
 					return;
 				}
 

apps/api/src/lib/scheduler.ts

@@ -11,11 +11,20 @@ const options: any = {
 	logger: false,
 	workerMessageHandler: async ({ name, message }) => {
 		if (name === 'deployApplication') {
-			if (message.pending === 0) {
-				if (!scheduler.workers.has('autoUpdater')) {
-					await scheduler.stop('deployApplication');
-					await scheduler.run('autoUpdater')
+			if (message.pending === 0 && message.size === 0) {
+				if (message.caller === 'autoUpdater') {
+					if (!scheduler.workers.has('autoUpdater')) {
+						await scheduler.stop('deployApplication');
+						await scheduler.run('autoUpdater')
+					}
 				}
+				if (message.caller === 'cleanupStorage') {
+					if (!scheduler.workers.has('cleanupStorage')) {
+						await scheduler.stop('deployApplication');
+						await scheduler.run('cleanupStorage')
+					}
+				}
+
 			}
 		}
 	},
@@ -25,7 +34,6 @@ const options: any = {
 		},
 		{
 			name: 'cleanupStorage',
-			interval: '10m'
 		},
 		{
 			name: 'checkProxies',