X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/e8d2cbde2ca6c6fb1a2867342132c5d7b93a5bd9..f86e80c400d084f36d438984444584ca9d589747:/bin/mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index 4dceb1d..4bd4db2 100755
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -48,38 +48,34 @@ while (my($name,$cluster) = each %$clusters)
     }
 
     $cluster->{name} = $name;
-
-    if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
-    {
-        $cluster->{status} = "down";
-    }
-    else
-    {
-        $cluster->{status} = "up";
-    }
+    $cluster->{status} = "down";
 }
 
 # Initialise server details
 foreach my $server (@servers)
 {
-    if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
-    {
-        $server->{status} = "down";
-    }
-    else
-    {
-        $server->{status} = "up";
-    }
+    $server->{status} = "up";
 }
 
 # If pingdom support is enabled then check which servers are up
 if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
 {
     my $ua = LWP::UserAgent->new;
+    my $cache;
 
+    $ua->timeout(5);
     $ua->default_header("App-Key", "2cohi62u5haxvqmypk3ljqqrze1jufrh");
     $ua->credentials("api.pingdom.com:443", "Pingdom API", $ENV{PINGDOM_USERNAME}, $ENV{PINGDOM_PASSWORD});
 
+    if (-f "pingdom.yml")
+    {
+        $cache = YAML::LoadFile("pingdom.yml"); 
+    }
+    else
+    {
+        $cache = {};
+    }
+
     foreach my $server (@servers)
     {
         if (my $checkid = $server->{pingdom})
@@ -91,18 +87,33 @@ if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
                 my $check = decode_json($response->content);
 
                 $server->{status} = $check->{check}->{status};
-
-                if ($server->{status} eq "up")
-                {
-                    $server->{cluster}->{status} = "up";
-                }
-                else
-                {
-                    $server->{cluster}->{bandwidth} = $server->{cluster}->{bandwidth} - $server->{bandwidth};
-                }
+                $cache->{$server->{pingdom}} = $check->{check}->{status};
             }
+            else
+            {
+                $server->{status} = $cache->{$server->{pingdom}} || "down";
+            }
+        }
+        else
+        {
+            $server->{status} = "down";
         }
     }
+
+    YAML::DumpFile("pingdom.yml", $cache);
+}
+
+# Mark a cluster as up if any servers are up
+foreach my $server (@servers)
+{
+    if ($server->{status} eq "up")
+    {
+        $server->{cluster}->{status} = "up";
+    }
+    else
+    {
+        $server->{cluster}->{bandwidth} = $server->{cluster}->{bandwidth} - $server->{bandwidth};
+    }
 }
 
 # Create target origins object
@@ -266,33 +277,33 @@ sub match_origin
     {
         $match = "preferred";
     }
-    elsif ($cluster->{preferred} &&
-           $cluster->{preferred}->{continents} &&
-           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
-    {
-        $match = "preferred";
-    }
     elsif ($cluster->{allowed} &&
            $cluster->{allowed}->{countries} &&
            grep { $_ eq $origin->{country} } @{$cluster->{allowed}->{countries}})
     {
         $match = "allowed";
     }
+    elsif ($cluster->{denied} &&
+           $cluster->{denied}->{countries} &&
+           grep { $_ eq $origin->{country} } @{$cluster->{denied}->{countries}})
+    {
+        $match = "denied";
+    }
+    elsif ($cluster->{preferred} &&
+           $cluster->{preferred}->{continents} &&
+           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
+    {
+        $match = "preferred";
+    }
     elsif ($cluster->{allowed} &&
            $cluster->{allowed}->{continents} &&
            grep { $_ eq $origin->{continent} } @{$cluster->{allowed}->{continents}})
     {
         $match = "allowed";
     }
-    elsif ($cluster->{denied} &&
-           $cluster->{denied}->{countries} &&
-           grep { $_ eq $origin->{country} } @{$cluster->{preferred}->{countries}})
-    {
-        $match = "denied";
-    }
     elsif ($cluster->{denied} &&
            $cluster->{denied}->{continents} &&
-           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
+           grep { $_ eq $origin->{continent} } @{$cluster->{denied}->{continents}})
     {
         $match = "denied";
     }
@@ -394,11 +405,11 @@ sub output_server
     {
         if ($server->{status} eq "up")
         {
-            $zonefile->print("+${name}:$server->{ipv4}:3600\n");
+            $zonefile->print("+${name}:$server->{ipv4}:600\n");
 
             if ($server->{ipv6})
             {
-#                $zonefile->print("3${name}:$server->{ipv6}:3600\n");
+#                $zonefile->print("3${name}:$server->{ipv6}:600\n");
             }
         }
     }