From 7a9436f97e54cd39792a2b3171abb966646fbe30 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 31 Oct 2013 17:56:22 +0000 Subject: [PATCH] Cache pingdom status values and use them if pingdom is down --- .gitignore | 1 + bin/mkgeo | 59 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 2b81324..4172355 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ data/ json/ kml/ origins/ +pingdom.yml diff --git a/bin/mkgeo b/bin/mkgeo index 4dceb1d..40527e2 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,29 @@ 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"; } } } + + 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 -- 2.43.2