From 09b1a17f921b712578fa478fcc0f9f88643c6da8 Mon Sep 17 00:00:00 2001 From: glyn Date: Fri, 24 Oct 2014 13:29:00 +0100 Subject: [PATCH] Minor changes: - We should detect changes to server conninfo - Fixed bug when checking csv sets where we were looking at the wrong value --- pgbouncer_follower.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pgbouncer_follower.pl b/pgbouncer_follower.pl index 81f092f..399ca65 100755 --- a/pgbouncer_follower.pl +++ b/pgbouncer_follower.pl @@ -197,8 +197,8 @@ sub generateConfig { else { undef @sets_origin; } - if (defined($node->[6])) { - @sets_subscribed = split(',', $node->[6]); + if (defined($node->[5])) { + @sets_subscribed = split(',', $node->[5]); } else { undef @sets_subscribed; @@ -225,7 +225,7 @@ sub generateConfig { $target_db = $node->[7]; $target_host = $node->[8]; $target_node_id = $node->[0]; - $target_sets = ($node->[6] // $node->[3]); + $target_sets = ($node->[5] // $node->[3]); $target_is_origin = false; } if (defined($node->[9])) { @@ -274,9 +274,9 @@ sub checkCluster { my $previous_cluster; foreach (@g_cluster) { if (!$g_origins_only || defined($_->[3])) { - $current_cluster = md5_hex(($current_cluster // "") . $_->[0] . $_->[2] . (defined($_->[3]) ? 't' : 'f')); + $current_cluster = md5_hex(($current_cluster // "") . $_->[0] . $_->[2] . (defined($_->[3]) ? 't' : 'f') . $_->[6]); if ($g_debug) { - printLogLn($g_logfile, "DEBUG: Node " . $_->[0] . " detail = " . $_->[2] . (defined($_->[3]) ? 't' : 'f')); + printLogLn($g_logfile, "DEBUG: Node " . $_->[0] . " detail = " . $_->[2] . (defined($_->[3]) ? 't' : 'f') . $_->[6]); } } } -- 2.39.5