X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/27a3dfe0c9ce66a7e2fb889260b9cdfffbc79856..4303a8a9f38bfeb1a79f73a03fe4e8bc6e77645b:/bin/mkgeo diff --git a/bin/mkgeo b/bin/mkgeo index dcc192a..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,25 +87,51 @@ 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 +my $targetorigins = {}; + # Initialise cluster details while (my($name,$cluster) = each %$clusters) { $cluster->{bandwidth_limit} = $cluster->{bandwidth} * 1024 * 1024; $cluster->{bandwidth_used} = 0; + + $targetorigins->{$cluster->{name}} = { + code => $cluster->{name}, + name => $cluster->{name}, + lat => $cluster->{lat}, + lon => $cluster->{lon}, + bandwidth => 0 + }; } my @mappings = (); @@ -162,9 +184,6 @@ while (grep { !exists($_->{cluster}) } values %$origins) # Create JSON collection object my @json; -# Create target origins object -my $targetorigins = {}; - # Open output files my $zonefile = IO::File->new("> data/${zone}") || die "$!"; my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!"; @@ -203,17 +222,6 @@ foreach my $origin (values %$origins) } }; - unless (exists($targetorigins->{$cluster->{name}})) - { - $targetorigins->{$cluster->{name}} = { - code => $cluster->{name}, - name => $cluster->{name}, - lat => $cluster->{lat}, - lon => $cluster->{lon}, - bandwidth => 0 - }; - } - $targetorigins->{$cluster->{name}}->{bandwidth} += $origin->{bandwidth}; } @@ -269,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"; }