@opentermsarchive/engine 0.36.0 → 0.36.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentermsarchive/engine",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Tracks and makes visible changes to the terms of online services",
   "homepage": "https://github.com/OpenTermsArchive/engine#readme",
   "bugs": {

package/src/index.js

@@ -51,10 +51,10 @@ export default async function track({ services, types, extractOnly, schedule })
       await reporter.initialize();
       archivist.attach(reporter);
     } else {
-      logger.warn('Configuration key "reporter.githubIssues.repositories.declarations" was not found; the Reporter module will be ignored');
+      logger.warn('Configuration key "reporter.githubIssues.repositories.declarations" was not found; issues on the declarations repository cannot be created');
     }
   } else {
-    logger.warn('Environment variable "GITHUB_TOKEN" was not found; the Notifier module will be ignored');
+    logger.warn('Environment variable "GITHUB_TOKEN" was not found; the Reporter module will be ignored');
   }
 
   if (!schedule) {

package/src/logger/index.js

@@ -34,43 +34,52 @@ const consoleTransport = new winston.transports.Console();
 
 const transports = [consoleTransport];
 
-if (process.env.SMTP_PASSWORD && config.get('logger.sendMailOnError')) {
-  const mailerOptions = {
-    to: config.get('logger.sendMailOnError.to'),
-    from: config.get('logger.sendMailOnError.from'),
-    host: config.get('logger.smtp.host'),
-    username: config.get('logger.smtp.username'),
-    password: process.env.SMTP_PASSWORD,
-    ssl: true,
-    timeout: 30 * 1000,
-    formatter: args => args[Object.getOwnPropertySymbols(args)[1]], // Returns the full error message, the same visible in the console. It is referenced in the argument object with a Symbol of which we do not have the reference but we know it is the second one.
-    exitOnError: true,
-  };
-
-  transports.push(new winston.transports.Mail({
-    ...mailerOptions,
-    level: 'error',
-    subject: `[OTA] Error Report — ${os.hostname()}`,
-  }));
-
-  if (config.get('logger.sendMailOnError.sendWarnings')) {
+const logger = winston.createLogger({
+  format: alignedWithColorsAndTime,
+  transports,
+  rejectionHandlers: transports,
+});
+
+if (config.get('logger.sendMailOnError')) {
+  if (process.env.SMTP_PASSWORD === undefined) {
+    logger.warn('Environment variable "SMTP_PASSWORD" was not found; log emails cannot be sent');
+  } else {
+    const mailerOptions = {
+      to: config.get('logger.sendMailOnError.to'),
+      from: config.get('logger.sendMailOnError.from'),
+      host: config.get('logger.smtp.host'),
+      username: config.get('logger.smtp.username'),
+      password: process.env.SMTP_PASSWORD,
+      ssl: true,
+      timeout: 30 * 1000,
+      formatter: args => args[Object.getOwnPropertySymbols(args)[1]], // Returns the full error message, the same visible in the console. It is referenced in the argument object with a Symbol of which we do not have the reference but we know it is the second one.
+      exitOnError: true,
+    };
+
     transports.push(new winston.transports.Mail({
       ...mailerOptions,
-      level: 'warn',
-      subject: `[OTA] Inaccessible content — ${os.hostname()}`,
+      level: 'error',
+      subject: `[OTA] Error Report — ${os.hostname()}`,
     }));
+
+    if (config.get('logger.sendMailOnError.sendWarnings')) {
+      transports.push(new winston.transports.Mail({
+        ...mailerOptions,
+        level: 'warn',
+        subject: `[OTA] Inaccessible content — ${os.hostname()}`,
+      }));
+    }
+
+    logger.configure({
+      transports,
+      rejectionHandlers: transports,
+    });
   }
 }
 
 let recordedSnapshotsCount;
 let recordedVersionsCount;
 
-const logger = winston.createLogger({
-  format: alignedWithColorsAndTime,
-  transports,
-  rejectionHandlers: transports,
-});
-
 logger.onFirstSnapshotRecorded = ({ serviceId, termsType, documentId, id }) => {
   logger.info({ message: `Recorded first snapshot with id ${id}`, serviceId, termsType, documentId });
   recordedSnapshotsCount++;