poller_output_remainder.patch

   1 diff -ruBbd cacti-0.8.6i/lib/poller.php cacti-0.8.6i-patched/lib/poller.php
   2 --- cacti-0.8.6i/lib/poller.php 2006-10-08 23:06:01.000000000 -0400
   3 +++ cacti-0.8.6i-patched/lib/poller.php 2006-11-21 23:41:02.000000000 -0500
   4 @@ -213,7 +213,7 @@
   5  /* process_poller_output - grabs data from the 'poller_output' table and feeds the *completed*
   6       results to RRDTool for processing
   7     @arg $rrdtool_pipe - the array of pipes containing the file descriptor for rrdtool */
   8 -function process_poller_output($rrdtool_pipe) {
   9 +function process_poller_output($rrdtool_pipe, $remainder = FALSE) {
  10         global $config;
  11
  12         include_once($config["library_path"] . "/rrd.php");
  13 @@ -221,6 +221,12 @@
  14         /* let's count the number of rrd files we processed */
  15         $rrds_processed = 0;
  16
  17 +       if ($remainder) {
  18 +               $limit = "";
  19 +       }else{
  20 +               $limit = "LIMIT 10000";
  21 +       }
  22 +
  23         /* create/update the rrd files */
  24         $results = db_fetch_assoc("select
  25                 poller_output.output,
  26 @@ -231,7 +237,7 @@
  27                 poller_item.rrd_num
  28                 from (poller_output,poller_item)
  29                 where (poller_output.local_data_id=poller_item.local_data_id and poller_output.rrd_name=poller_item.rrd_name)
  30 -               limit 10000");
  31 +               $limit");
  32
  33         if (sizeof($results) > 0) {
  34                 /* create an array keyed off of each .rrd file */
  35 diff -ruBbd cacti-0.8.6i/poller.php cacti-0.8.6i-patched/poller.php
  36 --- cacti-0.8.6i/poller.php     2006-10-08 23:06:01.000000000 -0400
  37 +++ cacti-0.8.6i-patched/poller.php     2006-11-12 11:49:05.000000000 -0500
  38 @@ -166,7 +166,7 @@
  39                 $polling_items = db_fetch_assoc("select poller_id,end_time from poller_time where poller_id = 0");
  40
  41                 if (sizeof($polling_items) == $process_file_number) {
  42 -                       $rrds_processed = $rrds_processed + process_poller_output($rrdtool_pipe);
  43 +                       $rrds_processed = $rrds_processed + process_poller_output($rrdtool_pipe, TRUE);
  44
  45                         /* take time and log performance data */
  46                         list($micro,$seconds) = split(" ", microtime());