cupcakearmy/coolify
1
0
Fork 0
mirror of https://github.com/cupcakearmy/coolify.git synced 2024-10-23 00:24:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: updateMany build logs

Browse Source
This commit is contained in:
Andras Bacsai 2022-09-14 13:19:55 +02:00
parent 1b9d9d3a8b
commit a762b1ed60
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
apps/api/src/jobs/deployApplication.ts
View File

@ -42,7 +42,7 @@ import * as buildpacks from '../lib/buildPacks';
application = decryptApplication(application) application = decryptApplication(application)
const originalApplicationId = application.id const originalApplicationId = application.id
if (pullmergeRequestId) { if (pullmergeRequestId) {
const previewApplications = await prisma.previewApplication.findMany({where: {applicationId: originalApplicationId, pullmergeRequestId}}) const previewApplications = await prisma.previewApplication.findMany({ where: { applicationId: originalApplicationId, pullmergeRequestId } })
if (previewApplications.length > 0) { if (previewApplications.length > 0) {
previewApplicationId = previewApplications[0].id previewApplicationId = previewApplications[0].id
} }
@ -112,17 +112,17 @@ import * as buildpacks from '../lib/buildPacks';
) )
.digest('hex'); .digest('hex');
const { debug } = settings; const { debug } = settings;
if (concurrency === 1) { // if (concurrency === 1) {
await prisma.build.updateMany({ // await prisma.build.updateMany({
where: { // where: {
status: { in: ['queued', 'running'] }, // status: { in: ['queued', 'running'] },
id: { not: buildId }, // id: { not: buildId },
applicationId, // applicationId,
createdAt: { lt: new Date(new Date().getTime() - 10 * 1000) } // createdAt: { lt: new Date(new Date().getTime() - 10 * 1000) }
}, // },
data: { status: 'failed' } // data: { status: 'failed' }
}); // });
} // }
let imageId = applicationId; let imageId = applicationId;
let domain = getDomain(fqdn); let domain = getDomain(fqdn);
const volumes = const volumes =
@ -346,10 +346,15 @@ import * as buildpacks from '../lib/buildPacks';
await saveBuildLog({ line: 'Deployment successful!', buildId, applicationId }); await saveBuildLog({ line: 'Deployment successful!', buildId, applicationId });
} catch (error) { } catch (error) {
await saveBuildLog({ line: error, buildId, applicationId }); await saveBuildLog({ line: error, buildId, applicationId });
await prisma.build.updateMany({ const foundBuild = await prisma.build.findUnique({ where: { id: buildId } })
where: { id: buildId, status: { in: ['queued', 'running'] } }, if (foundBuild) {
data: { status: 'failed' } await prisma.build.update({
}); where: { id: buildId },
data: {
status: 'failed'
}
});
}
throw new Error(error); throw new Error(error);
} }
await saveBuildLog({ line: 'Proxy will be updated shortly.', buildId, applicationId }); await saveBuildLog({ line: 'Proxy will be updated shortly.', buildId, applicationId });
@ -361,10 +366,15 @@ import * as buildpacks from '../lib/buildPacks';
} }
} }
catch (error) { catch (error) {
await prisma.build.updateMany({ const foundBuild = await prisma.build.findUnique({ where: { id: buildId } })
where: { id: buildId, status: { in: ['queued', 'running'] } }, if (foundBuild) {
data: { status: 'failed' } await prisma.build.update({
}); where: { id: buildId },
data: {
status: 'failed'
}
});
}
if (error !== 1) { if (error !== 1) {
await saveBuildLog({ line: error, buildId, applicationId: application.id }); await saveBuildLog({ line: error, buildId, applicationId: application.id });
} }