Output log with local timestamp correctly

groonga · Nov 5, 2012 · e3f2578 · e3f2578
1 parent cceb2ac
commit e3f2578
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/lib/logger.js b/lib/logger.js
@@ -34,9 +34,31 @@ function logQuery(selectQuery, elapsedTime) {
 }
 exports.query = logQuery;
 
-function setLogFilePath(context, path) {
-  var logger = getLogger(context);
-  logger.add(winston.transports.File, { filename: path });
-  logger.add(winston.transports.File, { filename: path, handleExceptions: true });
+function getLocalISOTimestamp() {
+   var date = new Date();
+  var offsetMinutes = date.getTimezoneOffset();
+  var timezoneOffset = ('0' + (Math.abs(offsetMinutes) / 60)).slice(-2) + ':' +
+                       ('0' + (Math.abs(offsetMinutes) % 60)).slice(-2);
+  if (offsetMinutes > 0) {
+    timezoneOffset = '-' + timezoneOffset;
+  } else {
+    timezoneOffset = '+' + timezoneOffset;
+  }
+  return date.getFullYear() + '-' +
+           ('0' + (date.getMonth() + 1)).slice(-2) + '-' +
+           ('0' + (date.getDate())).slice(-2) + 'T' +
+           ('0' + (date.getHours())).slice(-2) + ':' +
+           ('0' + (date.getMinutes())).slice(-2) + ':' +
+           ('0' + (date.getSeconds())).slice(-2) + '.' +
+           date.getMilliseconds() +
+           timezoneOffset;
+}
+
+function addFileTransport(context, filename, options) {
+  options = options || {};
+  options.filename = filename;
+  options.json = false;
+  options.timestamp = getLocalISOTimestamp;
+  getLogger(context).add(winston.transports.File, options);
 }
-exports.setLogFilePath = setLogFilePath;
+exports.addFileTransport = addFileTransport;
diff --git a/lib/server.js b/lib/server.js
@@ -33,10 +33,12 @@ function prepareLoggers(application, config) {
     application.use(express.logger({ stream: accessLogStream }));
   }
   if (config.queryLogPath) {
-    logger.setLogFilePath('query', CLI.resolve(config.queryLogPath));
+    logger.addFileTransport('query', CLI.resolve(config.queryLogPath));
   }
   if (config.errorLogPath) {
-    logger.setLogFilePath('error', CLI.resolve(config.errorLogPath));
+    logger.addFileTransport('error',
+                            filename: CLI.resolve(config.errorLogPath),
+                            { handleExceptions: true });
   }
 }