Use template literals in logger.js (haraka#2246)

smfreegard · Oct 26, 2017 · a6cfbf1 · a6cfbf1
1 parent 757bc92
commit a6cfbf1
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/logger.js b/logger.js
@@ -180,29 +180,29 @@ logger.set_loglevel = function (level) {
 
     const loglevel_num = parseInt(level);
     if (typeof level === 'string') {
-        this.log('INFO', 'loglevel: ' + level.toUpperCase());
+        this.log('INFO', `loglevel: ${level.toUpperCase()}`);
         logger.loglevel = logger.levels[level.toUpperCase()];
     }
     else {
         logger.loglevel = loglevel_num;
     }
 
     if (!Number.isInteger(logger.loglevel)) {
-        this.log('WARN', 'invalid loglevel: ' + level + ' defaulting to LOGWARN');
+        this.log('WARN', `invalid loglevel: ${level} defaulting to LOGWARN`);
         logger.loglevel = logger.levels.WARN;
     }
 }
 
 logger.set_format = function (format) {
     if (format) {
         logger.format = logger.formats[format.toUpperCase()];
-        this.log('INFO', 'log format: ' + format.toUpperCase());
+        this.log('INFO', `log format: ${format.toUpperCase()}`);
     }
     else {
         logger.format = null;
     }
     if (!logger.format) {
-        this.log('WARN', 'invalid log format: ' + format + ' defaulting to DEFAULT');
+        this.log('WARN', `invalid log format: ${format} defaulting to DEFAULT`);
         logger.format = logger.formats.DEFAULT;
     }
 };
@@ -303,12 +303,7 @@ logger.log_if_level = function (level, key, plugin) {
             default:
                 logger.log(
                     level,
-                    [
-                        '[' + logobj.level + ']',
-                        '[' + logobj.uuid + ']',
-                        '[' + logobj.origin + ']',
-                        logobj.message
-                    ].join(' ')
+                    `[${logobj.level}] [${logobj.uuid}] [${logobj.origin}] logobj.message`
                 );
                 return true;
         }