Don't try and check Pingdom if we don't have credentials
authorTom Hughes <tom@compton.nu>
Thu, 17 May 2012 20:42:26 +0000 (21:42 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 17 May 2012 20:42:26 +0000 (21:42 +0100)
bin/mkgeo

index ce98991c345d38339f7e0292044226742200573d..aa79f7b75f9fa256e03a3a6b2aa2319fff5e714f 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -15,24 +15,30 @@ my $source = shift @ARGV;
 my $zone = shift @ARGV;
 my $servers = YAML::LoadFile("src/${source}");
 
 my $zone = shift @ARGV;
 my $servers = YAML::LoadFile("src/${source}");
 
-my $ua = LWP::UserAgent->new;
-
-$ua->default_header("App-Key", "2cohi62u5haxvqmypk3ljqqrze1jufrh");
-$ua->credentials("api.pingdom.com:443", "Pingdom API", $ENV{PINGDOM_USERNAME}, $ENV{PINGDOM_PASSWORD});
-
 foreach my $server (values %$servers)
 {
     $server->{status} = "down";
 foreach my $server (values %$servers)
 {
     $server->{status} = "down";
+}
 
 
-    if (my $checkid = $server->{pingdom})
-    {
-        my $response = $ua->get("https://api.pingdom.com/api/2.0/checks/${checkid}");
+if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
+{
+    my $ua = LWP::UserAgent->new;
+
+    $ua->default_header("App-Key", "2cohi62u5haxvqmypk3ljqqrze1jufrh");
+    $ua->credentials("api.pingdom.com:443", "Pingdom API", $ENV{PINGDOM_USERNAME}, $ENV{PINGDOM_PASSWORD});
 
 
-        if ($response->is_success)
+    foreach my $server (values %$servers)
+    {
+        if (my $checkid = $server->{pingdom})
         {
         {
-            my $check = decode_json($response->content);
+            my $response = $ua->get("https://api.pingdom.com/api/2.0/checks/${checkid}");
+
+            if ($response->is_success)
+            {
+                my $check = decode_json($response->content);
 
 
-            $server->{status} = $check->{check}->{status};
+                $server->{status} = $check->{check}->{status};
+            }
         }
     }
 }
         }
     }
 }