@opentermsarchive/engine 2.6.0 → 2.7.1

package/config/default.json

@@ -48,7 +48,8 @@
         "host": "smtp-relay.sendinblue.com",
         "username": "admin@opentermsarchive.org"
       },
-      "sendMailOnError": false
+      "sendMailOnError": false,
+      "timestampPrefix": true
     },
     "notifier": {
       "sendInBlue": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentermsarchive/engine",
-  "version": "2.6.0",
+  "version": "2.7.1",
   "description": "Tracks and makes visible changes to the terms of online services",
   "homepage": "https://opentermsarchive.org",
   "bugs": {

package/scripts/dataset/logger/index.js

@@ -1,3 +1,4 @@
+import config from 'config';
 import winston from 'winston';
 
 import logger from '../../../src/logger/index.js';
@@ -6,11 +7,13 @@ const { combine, timestamp, printf, colorize } = winston.format;
 
 logger.format = combine(
   colorize(),
-  timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
+  timestamp({ format: 'YYYY-MM-DDTHH:mm:ssZ' }),
   printf(({ level, message, counter, hash, timestamp }) => {
     const prefix = counter && hash ? `${counter.toString().padEnd(6)} ${hash.padEnd(40)}` : '';
 
-    return `${timestamp} ${level.padEnd(15)} ${prefix.padEnd(50)} ${message}`;
+    const timestampPrefix = config.get('@opentermsarchive/engine.logger.timestampPrefix') ? `${timestamp} ` : '';
+
+    return `${timestampPrefix}${level.padEnd(15)} ${prefix.padEnd(50)} ${message}`;
   }),
 );
 

package/src/collection-api/logger.js

@@ -30,8 +30,12 @@ if (config.get('@opentermsarchive/engine.logger.sendMailOnError')) {
 const logger = winston.createLogger({
   format: combine(
     colorize(),
-    timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
-    printf(({ level, message, timestamp }) => `${timestamp} ${level.padEnd(15)} ${message}`),
+    timestamp({ format: 'YYYY-MM-DDTHH:mm:ssZ' }),
+    printf(({ level, message, timestamp }) => {
+      const timestampPrefix = config.get('@opentermsarchive/engine.logger.timestampPrefix') ? `${timestamp} ` : '';
+
+      return `${timestampPrefix}${level.padEnd(15)} ${message}`;
+    }),
   ),
   transports,
   rejectionHandlers: transports,

package/src/logger/index.js

@@ -8,23 +8,17 @@ const { combine, timestamp, printf, colorize } = winston.format;
 
 const alignedWithColorsAndTime = combine(
   colorize(),
-  timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
+  timestamp({ format: 'YYYY-MM-DDTHH:mm:ssZ' }),
   printf(({ level, message, timestamp, serviceId, termsType, documentId }) => {
-    let prefix = '';
+    const servicePrefix = serviceId && termsType
+      ? `${serviceId} — ${termsType}${documentId ? `:${documentId}` : ''}`
+      : '';
 
-    if (serviceId && termsType) {
-      prefix = `${serviceId} — ${termsType}`;
-    }
-
-    if (documentId) {
-      prefix = `${prefix}:${documentId}`;
-    }
+    const truncatedPrefix = servicePrefix.length > 75 ? `${servicePrefix.slice(0, 74)}…` : servicePrefix;
 
-    if (prefix.length > 75) {
-      prefix = `${prefix.substring(0, 74)}…`;
-    }
+    const timestampPrefix = config.get('@opentermsarchive/engine.logger.timestampPrefix') ? `${timestamp} ` : '';
 
-    return `${timestamp} ${level.padEnd(15)} ${prefix.padEnd(75)} ${message}`;
+    return `${timestampPrefix}${level.padEnd(15)} ${truncatedPrefix.padEnd(75)} ${message}`;
   }),
 );