[20922] trunk/dports/net/cacti

[source_changes at macosforge.org]

Revision: 20922
          http://trac.macosforge.org/projects/macports/changeset/20922
Author:   markd at macports.org
Date:     2006-12-10 22:54:23 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
Added patch missed in update to 0.8.6i.

Added Paths:
-----------
    trunk/dports/net/cacti/files/
    trunk/dports/net/cacti/files/poller_output_remainder.patch

Added: trunk/dports/net/cacti/files/poller_output_remainder.patch
===================================================================
--- trunk/dports/net/cacti/files/poller_output_remainder.patch	                        (rev 0)
+++ trunk/dports/net/cacti/files/poller_output_remainder.patch	2006-12-11 06:54:23 UTC (rev 20922)
@@ -0,0 +1,46 @@
+diff -ruBbd lib/poller.php.org lib/poller.php
+--- lib/poller.php.org	2006-10-08 23:06:01.000000000 -0400
++++ lib/poller.php	2006-11-21 23:41:02.000000000 -0500
+@@ -213,7 +213,7 @@
+ /* process_poller_output - grabs data from the 'poller_output' table and feeds the *completed*
+      results to RRDTool for processing
+    @arg $rrdtool_pipe - the array of pipes containing the file descriptor for rrdtool */
+-function process_poller_output($rrdtool_pipe) {
++function process_poller_output($rrdtool_pipe, $remainder = FALSE) {
+ 	global $config;
+ 
+ 	include_once($config["library_path"] . "/rrd.php");
+@@ -221,6 +221,12 @@
+ 	/* let's count the number of rrd files we processed */
+ 	$rrds_processed = 0;
+ 
++	if ($remainder) {
++		$limit = "";
++	}else{
++		$limit = "LIMIT 10000";
++	}
++
+ 	/* create/update the rrd files */
+ 	$results = db_fetch_assoc("select
+ 		poller_output.output,
+@@ -231,7 +237,7 @@
+ 		poller_item.rrd_num
+ 		from (poller_output,poller_item)
+ 		where (poller_output.local_data_id=poller_item.local_data_id and poller_output.rrd_name=poller_item.rrd_name)
+-		limit 10000");
++		$limit");
+ 
+ 	if (sizeof($results) > 0) {
+ 		/* create an array keyed off of each .rrd file */
+diff -ruBbd poller.php.org poller.php
+--- poller.php.org	2006-10-08 23:06:01.000000000 -0400
++++ poller.php	2006-11-12 11:49:05.000000000 -0500
+@@ -166,7 +166,7 @@
+ 		$polling_items = db_fetch_assoc("select poller_id,end_time from poller_time where poller_id = 0");
+ 
+ 		if (sizeof($polling_items) == $process_file_number) {
+-			$rrds_processed = $rrds_processed + process_poller_output($rrdtool_pipe);
++			$rrds_processed = $rrds_processed + process_poller_output($rrdtool_pipe, TRUE);
+ 
+ 			/* take time and log performance data */
+ 			list($micro,$seconds) = split(" ", microtime());

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061210/95ed1f14/attachment.html