Don't write an entry to the weighted lookup when all servers are down

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index ce0ff2f10c6a19db32408eaf168aad252f0616ca..0b38881a65bc6287606baa87274ce639d6d1d46b 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -259,11 +259,11 @@ if (!defined($gdnsname))
 
         if (my $default = $cluster->{default})
         {
-            output_server($zonefile, "${default}.${zone}", $cluster);
+            output_server($zonefile, "${default}.${zone}", $cluster, 0);
         }
         elsif (exists($cluster->{default}))
         {
-            output_server($zonefile, "${zone}", $cluster);
+            output_server($zonefile, "${zone}", $cluster, 0);
         }
     }
 }
@@ -275,11 +275,11 @@ foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
 
     if (@{$cluster->{servers}} > 1)
     {
-        output_server($zonefile, "${name}-%02d.${zone}", $cluster);
+        output_server($zonefile, "${name}-%02d.${zone}", $cluster, 1);
     }
     else
     {
-        output_server($zonefile, "${name}.${zone}", $cluster);
+        output_server($zonefile, "${name}.${zone}", $cluster, 1);
     }
 }
 
@@ -339,7 +339,7 @@ if (defined($gdnsname))
     {
         my $name = $cluster->{name};
 
-        if (@{$cluster->{servers}} > 1)
+        if (@{$cluster->{servers}} > 1 && grep { $_->{status} eq "up" } @{$cluster->{servers}})
         {
             $gdnsweightedfile->print("${name} => {\n");
 
@@ -527,10 +527,11 @@ sub output_server
     my $zonefile = shift;
     my $name = shift;
     my $cluster = shift;
+    my $all = shift;
 
     while (my($index,$server) = each @{$cluster->{servers}})
     {
-        if ($server->{status} eq "up")
+        if ($all || $server->{status} eq "up")
         {
             $zonefile->printf("  A(\"${name}\", \"$server->{ipv4}\", TTL(\"10m\")),\n", $index + 1);