Merge branch 'develop'

Author: jue89

README.md

@@ -2,7 +2,7 @@
 
 Node.js module for native bindings to the ~~dearly beloved~~ systemd-journald.
 
-Successfully tested under NodeJS v0.10.47, v0.12.16, v4.6.0, v6.7.0
+Successfully tested under NodeJS v0.10.48, v0.12.17, v4.6.1, v6.9.1, v7.0.0
 
 
 ## Example
@@ -128,6 +128,7 @@ log.debug( message, fields );   // - LOG_DEBUG
 Sepcial thanks to:
  * [ianare](https://github.com/ianare) for improving compatibility with older systemd versions.
  * [jez9999](https://github.com/jez9999) for making this module immune to future changes of syslog levels.
+ * [Z3TA](https://github.com/Z3TA) is responsible for ```CODE_FILE```, ```CODE_FUNC``` and ```CODE_LINE``` being settable by the ```fields``` parameter.
 
 I owe you a drink!
 

index.js

@@ -2,6 +2,8 @@
 
 var journal = require( './build/Release/journal_send.node' );
 
+var stackTraceRE = /at ([^\ ]+) \(([^:]+):([0-9]+):[0-9]+\)$/;
+
 function obj2iovec( iovec, obj, prefix ) {
 
 	if( prefix === undefined ) prefix = '';
@@ -11,7 +13,7 @@ function obj2iovec( iovec, obj, prefix ) {
 		var name = o.toUpperCase();
 		if( typeof obj[o] == 'object' ) {
 			obj2iovec( iovec, obj[o], prefix + name + "_" );
-		} else if( prefix.length > 0 || (name != 'PRIORITY' && name != 'MESSAGE') ) {
+		} else if( obj[o] !== undefined && (prefix.length > 0 || (name != 'PRIORITY' && name != 'MESSAGE')) ) {
 			iovec.push( prefix + name + '=' + obj[o].toString() );
 		}
 	}
@@ -32,10 +34,34 @@ function log( priority, message, fields ) {
 
 	// If the message is an instnce of Error, extract its message
 	if( message instanceof Error ) {
-		fields.STACK_TRACE = message.stack;
+
+		var stack = message.stack.toString();
+
+		// Store stack trace and message
+		fields.STACK_TRACE = stack;
 		message = message.message;
+
+		// Try to extract callee name, line and file
+		var tmp = stack.split('\n');
+		if( tmp.length >= 2 ) {
+
+			// Second line knows the error source
+			var errSource = tmp[1];
+
+			// Match regular expression and add info to iovec
+			var re = stackTraceRE.exec( errSource );
+			if( re !== null ) {
+				fields.CODE_FILE = re[2];
+				fields.CODE_FUNC = re[1];
+				fields.CODE_LINE = re[3];
+			}
+
+		}
+
 	} else if( typeof message != 'string' ) {
+
 		message = message.toString();
+
 	}
 
 	var iovec = [];
@@ -46,7 +72,7 @@ function log( priority, message, fields ) {
 	// Add additional fields
 	obj2iovec( iovec, fields );
 
-	// Send it to out beloved journald
+	// Send it to our beloved journald
 	journal.send.apply( null, [ parseInt( priority ) ].concat( iovec ) );
 
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "systemd-journald",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "Native bindings to journald",
   "keywords": [
     "logging",
@@ -33,7 +33,7 @@
     "linux"
   ],
   "jshintConfig": {
-    "esversion": 6,
+    "esversion": 5,
     "node": true,
     "strict": true,
     "loopfunc": true

src/journal_send.cc

@@ -2,11 +2,16 @@
 // Internet. It just copies an ordinary JavaScript string array into an iovec
 // and then finally calls sd_journal_sendv. Rocket science included!
 
-// Priority is a special case as it needs to be taken from the syslog.h
-// preprocessor definitions, which aren't available from JavaScript.
 
 #include <nan.h>
+
+// Instead of the locations being this file, let the user define their own
+// CODE_FILE, CODE_LINE and CODE_FUNC, via stack trace (ex: npm callsite)
+#define SD_JOURNAL_SUPPRESS_LOCATION 1
 #include <systemd/sd-journal.h>
+
+// Priority is a special case as it needs to be taken from the syslog.h
+// preprocessor definitions, which aren't available from JavaScript.
 #include <syslog.h>
 
 // Macros for int to string conversion

test/index.js

@@ -192,6 +192,9 @@ describe( "node-systemd-journald", function() {
 		try {
 			assert.strictEqual( journal_send.getField( 'PRIORITY' ), '7' );
 			assert.strictEqual( journal_send.getField( 'MESSAGE' ), 'Test' );
+			assert.strictEqual( journal_send.getField( 'CODE_LINE' ), '190' );
+			assert.strictEqual( journal_send.getField( 'CODE_FUNC' ), 'Context.<anonymous>' );
+			assert.strictEqual( journal_send.getField( 'CODE_FILE' ).substr( -13 ), 'test/index.js' );
 			assert.notStrictEqual( journal_send.getField( 'STACK_TRACE' ), undefined );
 			done();
 		} catch( e ) {