From 993694bee1963abe9a24c5a0d3f7472a9e457200 Mon Sep 17 00:00:00 2001 From: Chelsea Date: Sun, 19 Jan 2025 18:52:50 -0800 Subject: [PATCH] [CHORE] logs (#463) * logs * logs * logs --- backend/src/jobs/automated_reminders.ts | 24 ++++++++++++------- backend/src/jobs/end_recommitment.ts | 21 +++++++++-------- backend/src/jobs/start_recommitment.ts | 31 +++++++++++++++++-------- openshift/cron-end-recommitment.yml | 5 ++-- openshift/cron-notifications.yml | 5 ++-- openshift/cron-start-recommitment.yml | 5 ++-- 6 files changed, 55 insertions(+), 36 deletions(-) diff --git a/backend/src/jobs/automated_reminders.ts b/backend/src/jobs/automated_reminders.ts index 47394cbb..a92b0725 100644 --- a/backend/src/jobs/automated_reminders.ts +++ b/backend/src/jobs/automated_reminders.ts @@ -81,21 +81,27 @@ import { RecommitmentService } from '../recommitment/recommitment.service'; } else { const data = await recommitmentService.handleSendAutomatedReminders(); + logger.log('Supervisor emails:', 'Supervisor Notification'); logger.log( - `Supervisor emails sent: ${data.supervisor?.messages?.length}`, - 'Recommitment', + `TxId: ${data?.supervisor?.txId}`, + 'Supervisor Notification', ); - logger.log(`TxId: ${data.supervisor?.txId}`, 'Recommitment'); + data.supervisor?.messages?.forEach((supervisor) => { + logger.log( + `Supervisor: ${supervisor?.to}`, + 'Supervisor Notification', + ); + }); - logger.log( - `Member emails sent: ${data.member?.messages?.length}`, - 'Recommitment', - ); + logger.log('Member emails:', 'Member Notification'); + logger.log(`TxId: ${data?.member?.txId}`, 'Member Notification'); - logger.log(`TxId: ${data.member?.txId}`, 'Recommitment'); + data.member?.messages?.forEach((member) => { + logger.log(`Member: ${member?.to}`, 'Member Notification'); + }); - logger.log('Automated Reminder job completed', 'Recommitment'); + logger.log('Automated Reminder job completed', 'Member Notification'); return await app.close(); } diff --git a/backend/src/jobs/end_recommitment.ts b/backend/src/jobs/end_recommitment.ts index 3226a929..976bee71 100644 --- a/backend/src/jobs/end_recommitment.ts +++ b/backend/src/jobs/end_recommitment.ts @@ -58,20 +58,21 @@ import { RecommitmentService } from '../recommitment/recommitment.service'; } else { const data = await recommitmentService.handleEndRecommitment(); - logger.log( - `Supervisor emails sent: ${data.supervisor?.messages?.length}`, - 'Recommitment', - ); - + logger.log('Supervisor emails:', 'Recommitment'); logger.log(`TxId: ${data?.supervisor?.txId}`, 'Recommitment'); - logger.log( - `Member emails sent: ${data.member?.messages?.length}`, - 'Recommitment', - ); + data.supervisor?.messages?.forEach((supervisor) => { + logger.log(`Supervisor: ${supervisor?.to}`, 'Recommitment'); + }); + + logger.log('Member emails:', 'Recommitment'); + logger.log(`TxId: ${data?.member?.txId}`, 'Recommitment'); - logger.log(`TxId: ${data.member?.txId}`, 'Recommitment'); + data.member?.messages?.forEach((member) => { + logger.log(`Member: ${member?.to}`, 'Recommitment'); + }); + logger.log('Recommitment job completed', 'Recommitment'); logger.log('Recommitment job completed', 'Recommitment'); return await app.close(); diff --git a/backend/src/jobs/start_recommitment.ts b/backend/src/jobs/start_recommitment.ts index e7b9f133..83e655d8 100644 --- a/backend/src/jobs/start_recommitment.ts +++ b/backend/src/jobs/start_recommitment.ts @@ -53,20 +53,31 @@ import { RecommitmentService } from '../recommitment/recommitment.service'; await testRun(recommitmentService, datasource); await app.close(); } else { - logger.log('Starting recommitment job', 'Recommitment'); + logger.log('Starting recommitment job', 'Start Recommitment'); + const data = await recommitmentService.handleStartRecommitment(); - logger.log( - `Supervisor emails sent: ${data?.supervisor?.messages?.length}`, - 'Recommitment', - ); - logger.log(`TxId: ${data?.supervisor?.txId}`, 'Recommitment'); + logger.log('Supervisor emails:', 'Supervisor Start Recommitment'); logger.log( - `Member emails sent: ${data?.member?.messages?.length}`, - 'Recommitment', + `TxId: ${data?.supervisor?.txId}`, + 'Supervisor Start Recommitment', ); - logger.log(`TxId: ${data?.member?.txId}`, 'Recommitment'); - logger.log('Recommitment job completed', 'Recommitment'); + + data.supervisor?.messages?.forEach((supervisor) => { + logger.log( + `Supervisor: ${supervisor?.to}`, + 'Supervisor Start Recommitment', + ); + }); + + logger.log('Member emails:', 'Member Start Recommitment'); + logger.log(`TxId: ${data?.member?.txId}`, 'Member Start Recommitment'); + + data.member?.messages?.forEach((member) => { + logger.log(`Member: ${member?.to}`, 'Member Start Recommitment'); + }); + + logger.log('Recommitment job completed', 'Start Recommitment'); return await app.close(); } } catch (e) { diff --git a/openshift/cron-end-recommitment.yml b/openshift/cron-end-recommitment.yml index 5706e27c..60ed9e2f 100644 --- a/openshift/cron-end-recommitment.yml +++ b/openshift/cron-end-recommitment.yml @@ -36,6 +36,7 @@ objects: failedJobsHistoryLimit: 1 jobTemplate: spec: + activeDeadlineSeconds: 1200 template: metadata: labels: @@ -48,10 +49,10 @@ objects: image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${APP_NAME}-server:${IMAGE_TAG} resources: limits: - cpu: 40m + cpu: 50m memory: 256Mi requests: - cpu: 10m + cpu: 30m memory: 128Mi terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/openshift/cron-notifications.yml b/openshift/cron-notifications.yml index dbb9ea73..0bce6844 100644 --- a/openshift/cron-notifications.yml +++ b/openshift/cron-notifications.yml @@ -41,7 +41,6 @@ objects: labels: parent: 'cronjobpi' spec: - restartPolicy: OnFailure containers: - name: ${APP_NAME}-cron-notifications @@ -49,10 +48,10 @@ objects: image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${APP_NAME}-server:dev resources: limits: - cpu: 30m + cpu: 50m memory: 256Mi requests: - cpu: 10m + cpu: 30m memory: 128Mi terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/openshift/cron-start-recommitment.yml b/openshift/cron-start-recommitment.yml index 0d44be72..e2f361b8 100644 --- a/openshift/cron-start-recommitment.yml +++ b/openshift/cron-start-recommitment.yml @@ -36,6 +36,7 @@ objects: failedJobsHistoryLimit: 1 jobTemplate: spec: + activeDeadlineSeconds: 1200 template: metadata: labels: @@ -48,10 +49,10 @@ objects: image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${APP_NAME}-server:dev resources: limits: - cpu: 40m + cpu: 50m memory: 256Mi requests: - cpu: 10m + cpu: 30m memory: 128Mi terminationMessagePath: /dev/termination-log terminationMessagePolicy: File