Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: Sentry

Browse Source
This commit is contained in:
Andras Bacsai 2022-05-06 15:40:07 +02:00
parent fa5f439858
commit 6a6426fe6b
4 changed files with 66 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hooks.ts
View File

@ -114,5 +114,5 @@ export const getSession: GetSession = function ({ locals }) {
}; };
export async function handleError({ error, event }) { export async function handleError({ error, event }) {
if (!dev) sentry.captureException(error, event); // if (!dev) sentry.captureException(error, event);
} }

126
src/lib/database/common.ts
View File

@ -58,7 +58,7 @@ export function ErrorHandler(e: {
truncatedError.message = 'git clone failed'; truncatedError.message = 'git clone failed';
} }
if (!e.message?.includes('Coolify Proxy is not running')) { if (!e.message?.includes('Coolify Proxy is not running')) {
sentry.captureException(truncatedError); // sentry.captureException(truncatedError);
} }
const payload = { const payload = {
status: truncatedError.status || 500, status: truncatedError.status || 500,
@ -127,73 +127,73 @@ export function getServiceImages(type: string): string[] {
export function generateDatabaseConfiguration(database: Database & { settings: DatabaseSettings }): export function generateDatabaseConfiguration(database: Database & { settings: DatabaseSettings }):
| { | {
volume: string; volume: string;
image: string; image: string;
ulimits: Record<string, unknown>; ulimits: Record<string, unknown>;
privatePort: number; privatePort: number;
environmentVariables: { environmentVariables: {
MYSQL_DATABASE: string; MYSQL_DATABASE: string;
MYSQL_PASSWORD: string; MYSQL_PASSWORD: string;
MYSQL_ROOT_USER: string; MYSQL_ROOT_USER: string;
MYSQL_USER: string; MYSQL_USER: string;
MYSQL_ROOT_PASSWORD: string; MYSQL_ROOT_PASSWORD: string;
}; };
} }
| { | {
volume: string; volume: string;
image: string; image: string;
ulimits: Record<string, unknown>; ulimits: Record<string, unknown>;
privatePort: number; privatePort: number;
environmentVariables: { environmentVariables: {
MONGODB_ROOT_USER: string; MONGODB_ROOT_USER: string;
MONGODB_ROOT_PASSWORD: string; MONGODB_ROOT_PASSWORD: string;
}; };
} }
| { | {
volume: string; volume: string;
image: string; image: string;
ulimits: Record<string, unknown>; ulimits: Record<string, unknown>;
privatePort: number; privatePort: number;
environmentVariables: { environmentVariables: {
MARIADB_ROOT_USER: string; MARIADB_ROOT_USER: string;
MARIADB_ROOT_PASSWORD: string; MARIADB_ROOT_PASSWORD: string;
MARIADB_USER: string; MARIADB_USER: string;
MARIADB_PASSWORD: string; MARIADB_PASSWORD: string;
MARIADB_DATABASE: string; MARIADB_DATABASE: string;
}; };
} }
| { | {
volume: string; volume: string;
image: string; image: string;
ulimits: Record<string, unknown>; ulimits: Record<string, unknown>;
privatePort: number; privatePort: number;
environmentVariables: { environmentVariables: {
POSTGRESQL_POSTGRES_PASSWORD: string; POSTGRESQL_POSTGRES_PASSWORD: string;
POSTGRESQL_USERNAME: string; POSTGRESQL_USERNAME: string;
POSTGRESQL_PASSWORD: string; POSTGRESQL_PASSWORD: string;
POSTGRESQL_DATABASE: string; POSTGRESQL_DATABASE: string;
}; };
} }
| { | {
volume: string; volume: string;
image: string; image: string;
ulimits: Record<string, unknown>; ulimits: Record<string, unknown>;
privatePort: number; privatePort: number;
environmentVariables: { environmentVariables: {
REDIS_AOF_ENABLED: string; REDIS_AOF_ENABLED: string;
REDIS_PASSWORD: string; REDIS_PASSWORD: string;
}; };
} }
| { | {
volume: string; volume: string;
image: string; image: string;
ulimits: Record<string, unknown>; ulimits: Record<string, unknown>;
privatePort: number; privatePort: number;
environmentVariables: { environmentVariables: {
COUCHDB_PASSWORD: string; COUCHDB_PASSWORD: string;
COUCHDB_USER: string; COUCHDB_USER: string;
}; };
} { } {
const { const {
id, id,
dbUser, dbUser,

2
src/lib/queues/builder.ts
View File

@ -328,7 +328,7 @@ export default async function (job: Job<BuilderJob, void, string>): Promise<void
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 });
sentry.captureException(error); // sentry.captureException(error);
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 });

3
src/routes/applications/[id]/cancel.json.ts
View File

@ -31,7 +31,7 @@ async function stopBuild(buildId, applicationId) {
} }
if (count > 100) { if (count > 100) {
clearInterval(interval); clearInterval(interval);
return resolve(); return reject(new Error('Build canceled'));
} }
const { stdout: buildContainers } = await asyncExecShell( const { stdout: buildContainers } = await asyncExecShell(
@ -70,7 +70,6 @@ export const post: RequestHandler = async (event) => {
} }
try { try {
await stopBuild(buildId, applicationId); await stopBuild(buildId, applicationId);
await cleanupDB(buildId);
return { return {
status: 200, status: 200,
body: { body: {