Refine log

 - change nodejs log file path to runtime folder.
 - change log info format: hostname date level [file line] - log data

Signed-off-by: wanghouqi <[email protected]>

Author: wanghouqi

ehsm_kms_service/logger.js

@@ -1,24 +1,34 @@
 const log4js = require('log4js')
 
+// %h: host, %z: pid, %d: date, %p: level, %f: file, %l: line, %m: log data
+var log_pattern = '%h %z %d %p [%f{1}: line %l] - %m'
+
 log4js.configure({
   replaceConsole: true,
   appenders: {
+    stdout: {
+      type: 'console',
+      encoding: 'utf-8',
+      layout: {
+        type: 'pattern',
+        pattern: log_pattern
+      }
+    },
     cheese: {
       type: 'dateFile',
-      filename: `./logs/${new Date().getTime()}/info.log`,
+      filename: `/var/run/ehsm/logs/kms-service`,
       encoding: 'utf-8',
       layout: {
         type: 'pattern',
-        pattern:
-          '{"date":"%d","level":"%p","category":"%c","host":"%h","pid":"%z","data":\'%m\'}',
+        pattern: log_pattern
       },
-      pattern: '-yyyy-MM-dd',
+      pattern: 'yyyy-MM-dd.log',
       keepFileExt: true,
-      alwaysIncludePattern: true,
+      alwaysIncludePattern: true
     },
   },
   categories: {
-    default: { appenders: ['cheese'], level: 'debug' },
+    default: { appenders: ['stdout', 'cheese'], level: 'info', enableCallStack: true },
   },
 })
 

utils/log4cplus/log_utils.cpp

@@ -43,14 +43,14 @@ int initLogger(const char* logs_filename)
                                     MAX_FILE_SIZE, 
                                     MAX_FILE_NUMBER));
         fileAppender->setName(LOG4CPLUS_TEXT("file"));
-        log4cplus::tstring filePattern = LOG4CPLUS_TEXT("%d{%m/%d/%y %H:%M:%S,%q} %-4p %m %n");
+        log4cplus::tstring filePattern = LOG4CPLUS_TEXT("%h %d{%m/%d/%y %H:%M:%S,%q} %-4p %m %n");
         fileAppender->setLayout(std::auto_ptr<Layout>(new PatternLayout(filePattern)));
         Logger::getRoot().addAppender(fileAppender);
     }
 
     SharedAppenderPtr consoleAppender(new log4cplus::ConsoleAppender);
     consoleAppender->setName(LOG4CPLUS_TEXT("console"));
-    log4cplus::tstring consolePattern = LOG4CPLUS_TEXT("%d{%m/%d/%y %H:%M:%S,%q} %-4p %m %n");
+    log4cplus::tstring consolePattern = LOG4CPLUS_TEXT("%h %d{%m/%d/%y %H:%M:%S,%q} %-4p %m %n");
     consoleAppender->setLayout(std::auto_ptr<Layout>(new PatternLayout(consolePattern)));
 
     if (IS_DEBUG)