From fb34fb7ab5b2c75812d8e5a240382b08cb220685 Mon Sep 17 00:00:00 2001 From: Ultra2D Date: Sat, 5 Mar 2016 11:06:29 +0100 Subject: [PATCH] Syslog trim whitespace --- includes/syslog.php | 1 + tests/SyslogTest.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/syslog.php b/includes/syslog.php index 307f8e0da..f9120f845 100644 --- a/includes/syslog.php +++ b/includes/syslog.php @@ -115,6 +115,7 @@ function process_syslog($entry, $update) { } $entry['program'] = strtoupper($entry['program']); + $entry = array_map('trim', $entry); if ($update) { dbInsert( diff --git a/tests/SyslogTest.php b/tests/SyslogTest.php index c5e35c2ee..3be8ad30e 100644 --- a/tests/SyslogTest.php +++ b/tests/SyslogTest.php @@ -137,7 +137,7 @@ class SyslogTest extends \PHPUnit_Framework_TestCase ); $testdata[] = $this->createData( "1.1.1.1||authpriv||notice||notice||55||2016-02-28 00:23:34|| root : TTY=pts/1 ; PWD=/opt/librenms ; USER=librenms ; COMMAND=/usr/bin/git status||sudo", - array('device_id'=>1, 'program'=>'SUDO', 'msg'=>' root : TTY=pts/1 ; PWD=/opt/librenms ; USER=librenms ; COMMAND=/usr/bin/git status') + array('device_id'=>1, 'program'=>'SUDO', 'msg'=>'root : TTY=pts/1 ; PWD=/opt/librenms ; USER=librenms ; COMMAND=/usr/bin/git status') );