]> git.nbdom.net Git - nb.git/commitdiff
bin/ovh-api
authorDevops <sys@15gifts.com>
Mon, 10 Jul 2017 09:40:16 +0000 (10:40 +0100)
committerDevops <sys@15gifts.com>
Mon, 10 Jul 2017 09:40:16 +0000 (10:40 +0100)
bin/ovh-api

index b3f17668ec9ef653f359e650f0dd6cbfa149d547..370de71ac3b2a0caba7d2f3d3513eccf6312c225 100755 (executable)
@@ -96,7 +96,7 @@ sub ip_routed {
   
   if ($rec->{type} =~ /^(failover|dedicated)$/) {
     push @routed, [ $rec->{routedTo}{serviceName}, 'master' ];
-    push @routed, [ hostname(), 'slave' ] if grep {$_ eq $ip} @ips;
+    push @routed, [ hostname(), 'slave' ] if $rec->{routedTo}{serviceName} ne hostname() and grep {$_ eq $ip} @ips;
 
   } elsif ($rec->{type} eq 'loadBalancing') {
 
@@ -117,14 +117,17 @@ sub ip_routed {
 
           next if $server->{status} ne 'active';
           next if $dbl{$server->{address}}++;
+          #warn $server->{address};
           #use Data::Dumper; warn Dumper($server);
 
           my $routed = ip_routed($server->{address});
+          next if $dbl{$routed->[0][0]}++;
 
           my $status = lc($server->{serverState}[0]{status});
           $status = 'slave' if $server->{backup} and $status eq 'up';
 
           $routed->[0][1] = $status if $status ne 'up';
+          #push @{$routed->[0]},$frontend->{type};
 
           #next if $server->{backup};
           push @routed,@$routed;