From e615c4a55b5e0029ab07b31a3eb52884ecc469c5 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 27 Sep 2024 09:18:20 -0700 Subject: [PATCH] Add try catch to PBS/CDK and main. --- server.js | 9 +++++++- server/accounting/pbs/pbs-job-export.js | 30 ++++++++++++++----------- server/cdk/cdk-job-export.js | 30 ++++++++++++++----------- 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/server.js b/server.js index bef1cc1c8..f7d05bb6b 100644 --- a/server.js +++ b/server.js @@ -211,4 +211,11 @@ const main = async () => { }; // Start server -main(); +try { + main(); +} catch (error) { + logger.log(`Main-API-Error: Something was not caught in the application.`, "error", "api", null, { + error: error.message, + errorjson: JSON.stringify(error) + }); +} diff --git a/server/accounting/pbs/pbs-job-export.js b/server/accounting/pbs/pbs-job-export.js index 7101f2ad4..b43aa0e3b 100644 --- a/server/accounting/pbs/pbs-job-export.js +++ b/server/accounting/pbs/pbs-job-export.js @@ -602,18 +602,22 @@ async function MarkJobExported(socket, jobid) { } async function InsertFailedExportLog(socket, error) { - const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {}); - const result = await client - .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` }) - .request(queries.INSERT_EXPORT_LOG, { - log: { - bodyshopid: socket.JobData.bodyshop.id, - jobid: socket.JobData.id, - successful: false, - message: [error], - useremail: socket.user.email - } - }); + try { + const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {}); + const result = await client + .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` }) + .request(queries.INSERT_EXPORT_LOG, { + log: { + bodyshopid: socket.JobData.bodyshop.id, + jobid: socket.JobData.id, + successful: false, + message: [error], + useremail: socket.user.email + } + }); - return result; + return result; + } catch (error2) { + CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`); + } } diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js index 3766f836c..222a2b485 100644 --- a/server/cdk/cdk-job-export.js +++ b/server/cdk/cdk-job-export.js @@ -986,18 +986,22 @@ async function MarkJobExported(socket, jobid) { } async function InsertFailedExportLog(socket, error) { - const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {}); - const result = await client - .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` }) - .request(queries.INSERT_EXPORT_LOG, { - log: { - bodyshopid: socket.JobData.bodyshop.id, - jobid: socket.JobData.id, - successful: false, - message: [error], - useremail: socket.user.email - } - }); + try { + const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {}); + const result = await client + .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` }) + .request(queries.INSERT_EXPORT_LOG, { + log: { + bodyshopid: socket.JobData.bodyshop.id, + jobid: socket.JobData.id, + successful: false, + message: [error], + useremail: socket.user.email + } + }); - return result; + return result; + } catch (error2) { + CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`); + } }