Merge pull request #659 from PhilanthropyDataCommons/log-task-errors

PhilanthropyDataCommons · Dec 21, 2023 · c72e79b · c72e79b
2 parents cf8e5bc + 0efd1a6
commit c72e79b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/jobQueue.ts b/src/jobQueue.ts
@@ -19,19 +19,19 @@ export const jobQueueLogger = new Logger((scope) => (
   (level, message, meta) => {
     switch (level.valueOf()) {
       case 'error':
-        logger.error({ meta, scope }, message);
+        logger.error({ ...meta, scope }, message);
         break;
       case 'warn':
-        logger.warn({ meta, scope }, message);
+        logger.warn({ ...meta, scope }, message);
         break;
       case 'info':
-        logger.info({ meta, scope }, message);
+        logger.info({ ...meta, scope }, message);
         break;
       case 'debug':
-        logger.debug({ meta, scope }, message);
+        logger.debug({ ...meta, scope }, message);
         break;
       default:
-        logger.info({ meta, scope }, message);
+        logger.info({ ...meta, scope }, message);
     }
   }
 ));

diff --git a/src/tasks/processBulkUpload.ts b/src/tasks/processBulkUpload.ts
@@ -366,17 +366,17 @@ export const processBulkUpload = async (
         },
       ));
     });
-  } catch (error) {
-    helpers.logger.info('Bulk upload is being marked as failed', { error });
+  } catch (err) {
+    helpers.logger.info('Bulk upload is being marked as failed', { err });
     await updateBulkUploadStatus(bulkUpload.id, BulkUploadStatus.FAILED);
     return;
   }
   try {
     await bulkUploadFile.cleanup();
-  } catch (error) {
+  } catch (err) {
     helpers.logger.warn(
       `Cleanup of a temporary file failed (${bulkUploadFile.path})`,
-      { error },
+      { err },
     );
   }
   await updateBulkUploadStatus(bulkUpload.id, BulkUploadStatus.COMPLETED);