When poller first runs, time since last run produces an error (#4254)

When a poller first runs, there is no previous run timestamp but the code was trying to round on the default value which is a string. Closes #4254
Cacti · May 8, 2021 · a2febc0 · a2febc0
1 parent 39e337a
commit a2febc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 Cacti CHANGELOG
 
+1.2.18
+-issue#4254: When poller first runs, time since last run produces an error
+
 1.2.17
 -security#4019: Incorrect handling of fields led to potential XSS issues
 -security#4022: SQL Injection was possible due to incorrect validation order (CVE-2020-35701)

diff --git a/poller.php b/poller.php
@@ -332,12 +332,12 @@ function sig_handler($signo) {
 	$level = POLLER_VERBOSITY_MEDIUM;
 }
 
-$poller_seconds_sincerun = 'never';
+$poller_seconds_sincerun = 'Never';
 if (isset($poller_lastrun)) {
-	$poller_seconds_sincerun = $poller_start - $poller_lastrun;
+	$poller_seconds_sincerun = round($poller_start - $poller_lastrun, 2);
 }
 
-cacti_log("NOTE: Poller Int: '$poller_interval', $task_type Int: '$cron_interval', Time Since Last: '" . round($poller_seconds_sincerun,2) . "', Max Runtime '" . MAX_POLLER_RUNTIME. "', Poller Runs: '$poller_runs'", true, 'POLLER', $level);
+cacti_log("NOTE: Poller Int: '$poller_interval', $task_type Int: '$cron_interval', Time Since Last: '$poller_seconds_sincerun', Max Runtime '" . MAX_POLLER_RUNTIME. "', Poller Runs: '$poller_runs'", true, 'POLLER', $level);
 
 // our cron can run at either 1 or 5 minute intervals
 if ($poller_interval <= 60) {