rename resolveLoggelfLevel func, fix calls

Author: NickOvt

acme.js

@@ -7,7 +7,7 @@ const logger = require('restify-logger');
 const db = require('./lib/db');
 const Gelf = require('gelf');
 const os = require('os');
-const { resolveLoggelfLevel } = require('./lib/loggelf-level');
+const { normalizeLoggelfMessage } = require('./lib/loggelf-message');
 
 const acmeRoutes = require('./lib/api/acme');
 
@@ -79,7 +79,7 @@ module.exports = done => {
             };
         }
         message = message || {};
-        message.level = resolveLoggelfLevel(message);
+        normalizeLoggelfMessage(message);
 
         if (!message.short_message || message.short_message.indexOf(component.toUpperCase()) !== 0) {
             message.short_message = component.toUpperCase() + ' ' + (message.short_message || '');

api.js

@@ -24,7 +24,7 @@ const tls = require('tls');
 const Lock = require('ioredfour');
 const Path = require('path');
 const errors = require('restify-errors');
-const { resolveLoggelfLevel } = require('./lib/loggelf-level');
+const { normalizeLoggelfMessage } = require('./lib/loggelf-message');
 
 const acmeRoutes = require('./lib/api/acme');
 const usersRoutes = require('./lib/api/users');
@@ -493,7 +493,7 @@ module.exports = done => {
             };
         }
         message = message || {};
-        message.level = resolveLoggelfLevel(message);
+        normalizeLoggelfMessage(message);
 
         if (!message.short_message || message.short_message.indexOf(component.toUpperCase()) !== 0) {
             message.short_message = component.toUpperCase() + ' ' + (message.short_message || '');

imap.js

@@ -16,7 +16,7 @@ const certs = require('./lib/certs');
 const Gelf = require('gelf');
 const os = require('os');
 const Lock = require('ioredfour');
-const { resolveLoggelfLevel } = require('./lib/loggelf-level');
+const { normalizeLoggelfMessage } = require('./lib/loggelf-message');
 
 const onFetch = require('./lib/handlers/on-fetch');
 const onAuth = require('./lib/handlers/on-auth');
@@ -218,7 +218,7 @@ module.exports = done => {
         }
 
         message = message || {};
-        message.level = resolveLoggelfLevel(message);
+        normalizeLoggelfMessage(message);
 
         if (!message.short_message || message.short_message.indexOf(component.toUpperCase()) !== 0) {
             message.short_message = component.toUpperCase() + ' ' + (message.short_message || '');

indexer.js

@@ -13,7 +13,7 @@ const { ObjectId } = require('mongodb');
 const libmime = require('libmime');
 const punycode = require('punycode.js');
 const { getClient } = require('./lib/elasticsearch');
-const { resolveLoggelfLevel } = require('./lib/loggelf-level');
+const { normalizeLoggelfMessage } = require('./lib/loggelf-message');
 
 let loggelf;
 let processlock;
@@ -590,7 +590,7 @@ module.exports.start = callback => {
         }
 
         message = message || {};
-        message.level = resolveLoggelfLevel(message);
+        normalizeLoggelfMessage(message);
 
         if (!message.short_message || message.short_message.indexOf(component.toUpperCase()) !== 0) {
             message.short_message = component.toUpperCase() + ' ' + (message.short_message || '');

lib/errors.js

@@ -6,7 +6,7 @@ const log = require('npmlog');
 const Gelf = require('gelf');
 const os = require('os');
 const util = require('util');
-const { resolveLoggelfLevel } = require('./loggelf-level');
+const { normalizeLoggelfMessage } = require('./loggelf-message');
 
 let loggelf;
 let component;
@@ -67,7 +67,7 @@ loggelf = (...args) => {
     message.host = hostname;
     message.timestamp = Date.now() / 1000;
     message._component = component;
-    message.level = resolveLoggelfLevel(message);
+    normalizeLoggelfMessage(message);
 
     Object.keys(message).forEach(key => {
         if (!message[key]) {

lib/loggelf-level.js lib/loggelf-message.jslib/loggelf-level.js renamed to lib/loggelf-message.js

@@ -2,7 +2,7 @@
 
 const hasValue = value => (typeof value === 'string' ? value.trim().length > 0 : !!value);
 
-module.exports.resolveLoggelfLevel = message => {
+module.exports.normalizeLoggelfMessage = message => {
     if (!message || typeof message !== 'object') {
         return;
     }

lmtp.js

@@ -14,7 +14,7 @@ const db = require('./lib/db');
 const certs = require('./lib/certs');
 const Gelf = require('gelf');
 const os = require('os');
-const { resolveLoggelfLevel } = require('./lib/loggelf-level');
+const { normalizeLoggelfMessage } = require('./lib/loggelf-message');
 
 let messageHandler;
 let userHandler;
@@ -218,7 +218,7 @@ module.exports = done => {
             };
         }
         message = message || {};
-        message.level = resolveLoggelfLevel(message);
+        normalizeLoggelfMessage(message);
 
         if (!message.short_message || message.short_message.indexOf(component.toUpperCase()) !== 0) {
             message.short_message = component.toUpperCase() + ' ' + (message.short_message || '');

pop3.js

@@ -13,7 +13,7 @@ const LimitedFetch = require('./lib/limited-fetch');
 const tools = require('./lib/tools');
 const Gelf = require('gelf');
 const os = require('os');
-const { resolveLoggelfLevel } = require('./lib/loggelf-level');
+const { normalizeLoggelfMessage } = require('./lib/loggelf-message');
 
 const MAX_MESSAGES = 250;
 
@@ -467,7 +467,7 @@ module.exports = done => {
             };
         }
         message = message || {};
-        message.level = resolveLoggelfLevel(message);
+        normalizeLoggelfMessage(message);
 
         if (!message.short_message || message.short_message.indexOf(component.toUpperCase()) !== 0) {
             message.short_message = component.toUpperCase() + ' ' + (message.short_message || '');

tasks.js

@@ -30,7 +30,7 @@ const taskClearFolder = require('./lib/tasks/clear-folder');
 const taskSearchApply = require('./lib/tasks/search-apply');
 const taskUserIndexing = require('./lib/tasks/user-indexing');
 const taskRunMigrations = require('./lib/tasks/run-migrations');
-const { resolveLoggelfLevel } = require('./lib/loggelf-level');
+const { normalizeLoggelfMessage } = require('./lib/loggelf-message');
 
 let messageHandler;
 let mailboxHandler;
@@ -66,7 +66,7 @@ module.exports.start = callback => {
         }
 
         message = message || {};
-        message.level = resolveLoggelfLevel(message);
+        normalizeLoggelfMessage(message);
 
         if (!message.short_message || message.short_message.indexOf(component.toUpperCase()) !== 0) {
             message.short_message = component.toUpperCase() + ' ' + (message.short_message || '');

webhooks.js

@@ -11,7 +11,7 @@ const { ObjectId } = require('mongodb');
 const axios = require('axios');
 const packageData = require('./package.json');
 const { MARKED_SPAM, MARKED_HAM } = require('./lib/events');
-const { resolveLoggelfLevel } = require('./lib/loggelf-level');
+const { normalizeLoggelfMessage } = require('./lib/loggelf-message');
 
 let loggelf;
 let queueWorkers = {};
@@ -98,7 +98,7 @@ module.exports.start = callback => {
         }
 
         message = message || {};
-        message.level = resolveLoggelfLevel(message);
+        normalizeLoggelfMessage(message);
 
         if (!message.short_message || message.short_message.indexOf(component.toUpperCase()) !== 0) {
             message.short_message = component.toUpperCase() + ' ' + (message.short_message || '');