Merge branch 'journalctl' into 'develop'

Add journalctl support for logs

See merge request ispconfig/ispconfig3!1342

Author: Marius Burkard

server/lib/classes/monitor_tools.inc.php

@@ -503,6 +503,7 @@ public function _getLogData($log, $max_lines = 100) {
 
 		$dist = '';
 		$logfile = '';
+		$journalmatch = '';
 
 		if (@is_file('/etc/debian_version')) {
 			$dist = 'debian';
@@ -552,7 +553,7 @@ public function _getLogData($log, $max_lines = 100) {
 			if ($dist == 'debian') {
 				$logfile = '/var/log/syslog';
 			} elseif ($dist == 'redhat') {
-				$logfile = '/var/log/messages';
+				$journalmatch = ' ';
 			} elseif ($dist == 'suse') {
 				$logfile = '/var/log/messages';
 			} elseif ($dist == 'gentoo') {
@@ -653,27 +654,40 @@ public function _getLogData($log, $max_lines = 100) {
 			if (stristr($logfile, ';') or substr($logfile, 0, 9) != '/var/log/' or stristr($logfile, '..')) {
 				$log = 'Logfile path error.';
 			} else {
-				$log = '';
 				if (is_readable($logfile)) {
-					$fd = popen('tail -n '.intval($max_lines).' ' . escapeshellarg($logfile), 'r');
-					if ($fd) {
-						while (!feof($fd)) {
-							$log .= fgets($fd, 4096);
-							$n++;
-							if ($n > 1000)
-								break;
-						}
-						fclose($fd);
-					}
+					$log = $this->_getOutputFromExecCommand('tail -n '.intval($max_lines).' ' . escapeshellarg($logfile));
 				} else {
 					$log = 'Unable to read ' . $logfile;
 				}
 			}
+		} else {
+			if($journalmatch != ''){
+				$log = $this->_getOutputFromExecCommand('journalctl -n '.intval($max_lines).' --no-pager ' . escapeshellcmd($journalmatch));
+			}else{
+				$log = 'Unable to read logfile';
+			}
+
 		}
 
 		return $log;
 	}
 
+	private function _getOutputFromExecCommand ($command) {
+		$log = '';
+		$fd = popen($command, 'r');
+		if ($fd) {
+			$n = 0;
+			while (!feof($fd)) {
+				$log .= fgets($fd, 4096);
+				$n++;
+				if ($n > 1000)
+					break;
+			}
+			fclose($fd);
+		}
+		return $log;
+	}
+
 	private function _checkTcp($host, $port) {
 		/* Try to open a connection */
 		$fp = @fsockopen($host, $port, $errno, $errstr, 2);