Fixing issue with poller replication

Author: TheWitness

README.md

@@ -51,6 +51,10 @@ Got any ideas or complaints, please log an issue on GitHub.
 
 ## Changelog
 
+--- develop ---
+
+* issue: Fix issue with replication full sync errors
+
 --- 1.1 ---
 
 * feature#3: When changing UPS snmp and other settings on the UPS edit page, transfer those changes to the Cacti device

setup.php

@@ -314,15 +314,28 @@ function apcupsd_config_settings () {
 }
 
 function apcupsd_replicate_out($data) {
+	global $config;
+
 	include_once($config['base_path'] . '/lib/poller.php');
 
-	$data = db_fetch_assoc('SELECT * FROM apcupsd_ups');
+	$pollers  = db_fetch_assoc_prepared('SELECT id
+		FROM poller
+		WHERE id > 1
+		AND disabled = ""
+		AND status NOT IN (?, ?)',
+		array(POLLER_STATUS_DOWN, POLLER_STATUS_HEARTBEAT));
 
-	replicate_out_table($data['rcnn_id'], $data, 'apcupsd_ups', $data['remote_poller_id']);
+	$ups       = db_fetch_assoc('SELECT * FROM apcupsd_ups');
+	$ups_stats = db_fetch_assoc('SELECT * FROM apcupsd_ups_stats');
 
-	$data = db_fetch_assoc('SELECT * FROM apcupsd_ups_stats');
+	if (cacti_sizeof($pollers)) {
+		foreach($pollers as $poller) {
+			$rcnn_id = poller_connect_to_remote($poller['id']);
 
-	replicate_out_table($data['rcnn_id'], $data, 'apcupsd_ups_stats', $data['remote_poller_id']);
+			replicate_out_table($rcnn_id, $ups, 'apcupsd_ups', $poller['id']);
+			replicate_out_table($rcnn_id, $ups_stats, 'apcupsd_ups', $poller['id']);
+		}
+	}
 
 	return $data;
 }