[CHORE] logs (#463)

* logs * logs * logs
bcgov · Jan 20, 2025 · 993694b · 993694b
1 parent aef2a31
commit 993694b
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -41,18 +41,17 @@ objects:
               labels:
                 parent: 'cronjobpi'
             spec:
-
               restartPolicy: OnFailure
               containers:
               - name: ${APP_NAME}-cron-notifications
                 restartPolicy: OnFailure
                 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
@@ -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