- original patches came first, pa patch needs update

[packages/cacti.git] / poller_interval.patch

diff --git a/poller_interval.patch b/poller_interval.patch
index 57e2c63e619013872aa7196d34f7e864caee508b..dac3956c999343c02de7c92e9e1f57ec6ba173c6 100644 (file)
--- a/poller_interval.patch
+++ b/poller_interval.patch
@@ -117,8 +117,7 @@ diff -ruBbd cacti-0.8.7g/poller.php cacti-0.8.7g-patched/poller.php
                                }
                        }
                }
-
-@@ -430,29 +430,28 @@
+@@ -427,28 +426,27 @@
        $poller_runs_completed++;
  
        /* record the start time for this loop */
@@ -133,34 +132,30 @@ diff -ruBbd cacti-0.8.7g/poller.php cacti-0.8.7g-patched/poller.php
 -                      $sleep_time = ($poller_interval - ($loop_end - $loop_start) - $overhead_time);
 -              }else{
 -                      $sleep_time = ($poller_interval -  ($loop_end - $loop_start));
--              }
--
-+                       $sleep_time = $poller_interval - $loop_time - $overhead_time;
-+                } else {
-+                       $sleep_time = $poller_interval - $loop_time;
-+                }
-+              
++                      $sleep_time = $poller_interval - $loop_time - $overhead_time;
++              } else {
++                      $sleep_time = $poller_interval - $loop_time;
+               }
+ 
                /* log some nice debug information */
 -              if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_DEBUG) {
 -                      echo "Loop  Time is: " . ($loop_end - $loop_start) . "\n";
 -                      echo "Sleep Time is: " . $sleep_time . "\n";
 -                      echo "Total Time is: " . ($loop_end - $poller_start) . "\n";
-+                if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_DEBUG || $debug) {
-+                        echo "Loop  Time is: " . round($loop_time, 2) . "\n";
-+                        echo "Sleep Time is: " . round($sleep_time, 2) . "\n";
-+                        echo "Total Time is: " . round($loop_end - $poller_start, 2) . "\n";
++              if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_DEBUG || $debug) {
++                      echo "Loop  Time is: " . round($loop_time, 2) . "\n";
++                      echo "Sleep Time is: " . round($sleep_time, 2) . "\n";
++                      echo "Total Time is: " . round($loop_end - $poller_start, 2) . "\n";
                }
  
                /* sleep the appripriate amount of time */
                if ($poller_runs_completed < $poller_runs) {
-                       api_plugin_hook('poller_bottom');
 -                      db_close();
                        usleep($sleep_time * 1000000);
 -                      db_connect_real($database_hostname, $database_username, $database_password, $database_default, $database_type, $database_port);
-                       api_plugin_hook('poller_top');
                }
        }else if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_MEDIUM || $debug) {
-
+               cacti_log("WARNING: Cacti Polling Cycle Exceeded Poller Interval by " . $loop_end-$loop_start-$poller_interval . " seconds", TRUE, "POLLER");
 @@ -459,7 +457,7 @@
        $hosts_per_process, $num_polling_items, $rrds_processed) {