Merge pull request #5 from Wieltje/master

Minor fixes + column formatter feature
log4js2 · Apr 25, 2017 · 480a503 · 480a503
2 parents 7b8d539 + 4f1457e
commit 480a503
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/src/formatter.js b/src/formatter.js
@@ -106,6 +106,24 @@ let _formatLineNumber = function (logEvent) {
 
 };
 
+/**
+ * @function
+ * @memberOf formatter
+ *
+ * @param {LOG_EVENT} logEvent
+ *
+ * @return {string}
+ */
+let _formatColumn = function (logEvent) {
+
+    if (!logEvent.column) {
+		_getFileDetails(logEvent);
+	}
+
+	return `${logEvent.column}`;
+
+};
+
 /**
  * @function
  * @memberOf formatter
@@ -230,6 +248,7 @@ let _formatters = {
 	'F|file' : _formatFile,
 	'K|map|MAP' : _formatMapMessage,
 	'L|line' : _formatLineNumber,
+	'column': _formatColumn,
 	'm|msg|message' : _formatLogMessage,
 	'M|method' : _formatMethodName,
 	'n' : _formatLineSeparator,
@@ -452,11 +471,14 @@ let _getFileDetails = function (logEvent) {
 
 		logEvent.column = fileParts.pop();
 		logEvent.lineNumber = fileParts.pop();
-
+		
 		if (typeof define !== 'undefined') {
 			let path = require('path');
 			let appDir = path.dirname(require.main.filename);
-			logEvent.filename = fileParts.join(':').replace(appDir, '').replace(/(\\|\/)/, '');
+			if (!fileParts[0].startsWith(appDir)) {
+				appDir = '';
+			}
+			logEvent.filename = fileParts.join(':').replace(appDir, '').replace(/^(\\|\/)/, '');
 		} else {
 			logEvent.filename = fileParts.join(':');
 		}
@@ -468,7 +490,7 @@ let _getFileDetails = function (logEvent) {
 		logEvent.lineNumber = '?';
 
 	}
-
+	logEvent.file = logEvent.filename;
 };
 
 /**

diff --git a/src/index.js b/src/index.js
@@ -319,7 +319,7 @@ export function getLogger(context) {
  */
 export function setLogLevel(logLevel, logger) {
 
-    if (logLevel instanceof Number) {
+    if (Number.isInteger(logLevel)) {
 
         if (logger) {
             if (_loggers[logger]) {