remove host & pid detail from syslog display (#9)

haraka · Jan 24, 2017 · bbeb367 · bbeb367
1 parent 748f84c
commit bbeb367
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,8 @@
+
+1.0.6 - 2017-01-23
+
+    * remove host & pid detail from syslog lines
+
 1.0.5 - 2016-11-04
 
     * display log entries for transactions

diff --git a/config/log.reader.ini b/config/log.reader.ini
@@ -1,3 +1,4 @@
 
 [log]
-file=/var/log/haraka.log
+file=/var/log/haraka.log
+; file=/var/log/maillog
diff --git a/index.js b/index.js
@@ -113,6 +113,12 @@ exports.asHtml = function (uuid, matched, done) {
     if (transId && transId[1]) replaceString = '[' + transId[1] + '] ';
 
     var trimmed = line.replace(/\[[A-F0-9\-\.]{12,40}\] /, replaceString);
+
+    // strip syslog prepended host and PID
+    if ( / haraka\[[0-9]+\]: /.test(trimmed) ) {
+      trimmed = trimmed.replace(/(?: [a-z\.\-]+)? haraka\[[0-9]+\]: /, ' ');
+    }
+
     rawLogs += trimmed + '<br>';
     if (/\[karma/.test(line) && /awards/.test(line)) {
       lastKarmaLine = line;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-log-reader",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "display log entries from haraka log files via HTTP",
   "main": "index.js",
   "scripts": {