Syslog stats not reporting properly

Cacti · Mar 12, 2020 · cb305a2 · cb305a2
1 parent 8f8cc00
commit cb305a2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -155,6 +155,10 @@ that.
 
 ## ChangeLog
 
+--- develop ---
+
+* issue: Syslog stats not reporting properly
+
 --- 2.8 ---
 
 * issue#115: Some field where not corrected following the version change

diff --git a/functions.php b/functions.php
@@ -284,7 +284,7 @@ function syslog_remove_items($table, $uniqueID) {
 							WHERE facility_id = ' . $facility_id;
 					}
 				}
-			}elseif ($remove['type'] == 'host') {
+			} elseif ($remove['type'] == 'host') {
 				if ($table == 'syslog_incoming') {
 					if ($remove['method'] != 'del') {
 						$sql1 = 'INSERT INTO `' . $syslogdb_default . '`.`syslog_removed`
@@ -444,7 +444,7 @@ function syslog_remove_items($table, $uniqueID) {
 							WHERE message LIKE ' . db_qstr('%' . $remove['message']);
 					}
 				}
-			}elseif ($remove['type'] == 'sql') {
+			} elseif ($remove['type'] == 'sql') {
 				if ($table == 'syslog_incoming') {
 					if ($remove['method'] != 'del') {
 						$sql1 = 'INSERT INTO `' . $syslogdb_default . '`.`syslog_removed`
@@ -508,8 +508,6 @@ function syslog_remove_items($table, $uniqueID) {
 		}
 	}
 
-	if ($removed == 0) $xferred = $total;
-
 	return array('removed' => $removed, 'xferred' => $xferred);
 }
 
@@ -598,7 +596,7 @@ function sql_hosts_where($tab) {
 				}
 			}
 
-			if (sizeof($hosts_array)) {
+			if (cacti_sizeof($hosts_array)) {
 				$hostfilter_log = ' host IN(' . implode(',', $hosts_array) . ')';
 			}
 
@@ -717,7 +715,7 @@ function syslog_debug($message) {
 	global $syslog_debug;
 
 	if ($syslog_debug) {
-		echo 'SYSLOG: ' . trim($message) . "\n";
+		print 'SYSLOG: ' . trim($message) . "\n";
 	}
 }
 
@@ -767,7 +765,7 @@ function syslog_log_alert($alert_id, $alert_name, $severity, $msg, $count = 1, $
 		$save['alert_name']  = $alert_name;
 
 		if (cacti_sizeof($hosts)) {
-			foreach($hosts as $host){
+			foreach($hosts as $host) {
 				$save['host'] = $host;
 				api_plugin_hook_function('syslog_update_hostsalarm', $save);
 			}

diff --git a/syslog_process.php b/syslog_process.php
@@ -176,11 +176,15 @@
 syslog_debug('Unique ID = ' . $uniqueID);
 
 /* flag all records with the uniqueID prior to moving */
-syslog_db_execute('UPDATE `' . $syslogdb_default . '`.`syslog_incoming` SET status=' . $uniqueID . ' WHERE status=0');
+syslog_db_execute('UPDATE `' . $syslogdb_default . '`.`syslog_incoming`
+	SET status = ' . $uniqueID . '
+	WHERE status = 0');
 
 api_plugin_hook('plugin_syslog_before_processing');
 
-$syslog_incoming = db_affected_rows($syslog_cnn);
+$syslog_incoming = db_fetch_cell('SELECT COUNT(seq)
+	FROM `' . $syslogdb_default . '`.`syslog_incoming`
+	WHERE status = ' . $uniqueID);
 
 syslog_debug('Found   ' . $syslog_incoming .  ', New Message(s) to process');
 
@@ -191,7 +195,7 @@
 
 	foreach($domains as $domain) {
 		syslog_db_execute('UPDATE `' . $syslogdb_default . "`.`syslog_incoming`
-			SET host=SUBSTRING_INDEX(host,'.',1)
+			SET host = SUBSTRING_INDEX(host, '.', 1)
 			WHERE host LIKE '%$domain'");
 	}
 }