Fix syntax error

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index d942ee0e603c1474c92d86159f8d779ebf35f345..94c600a8e6fc7253515416e8a6628cbb8305ed10 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -9,15 +9,14 @@ use IO::File;
 use Math::Trig qw(deg2rad pip2 great_circle_distance);
 use JSON::XS;
 use LWP::UserAgent;
 use Math::Trig qw(deg2rad pip2 great_circle_distance);
 use JSON::XS;
 use LWP::UserAgent;

-use YAML;
+use YAML::XS qw(LoadFile DumpFile);

 
 my $originfile = shift @ARGV;
 my $clusterfile = shift @ARGV;
 my $zone = shift @ARGV;
 
 my $originfile = shift @ARGV;
 my $clusterfile = shift @ARGV;
 my $zone = shift @ARGV;

-my $jszone = shift @ARGV;

 my $targetoriginfile = shift @ARGV;
 my $targetoriginfile = shift @ARGV;

-my $origins = YAML::LoadFile($originfile);
-my $clusters = YAML::LoadFile($clusterfile);
+my $origins = LoadFile($originfile);
+my $clusters = LoadFile($clusterfile);

 my $gdnsname = shift @ARGV;
 my @servers;
 
 my $gdnsname = shift @ARGV;
 my @servers;
 


@@ -26,12 +25,12 @@ while (my($name,$cluster) = each %$clusters)
 {
     if ($cluster->{servers})
     {
 {
     if ($cluster->{servers})
     {

-        $cluster->{bandwidth} = 0;
+        $cluster->{requests} = 0;

 
         foreach my $server (@{$cluster->{servers}})
         {
             $server->{cluster} = $cluster;
 
         foreach my $server (@{$cluster->{servers}})
         {
             $server->{cluster} = $cluster;

-            $cluster->{bandwidth} = $cluster->{bandwidth} + $server->{bandwidth};
+            $cluster->{requests} = $cluster->{requests} + $server->{requests};

 
             push @servers, $server;
         }
 
             push @servers, $server;
         }


@@ -41,7 +40,8 @@ while (my($name,$cluster) = each %$clusters)
         my $server = {
             cluster => $cluster,
             statuscake => $cluster->{statuscake},
         my $server = {
             cluster => $cluster,
             statuscake => $cluster->{statuscake},

-            bandwidth => $cluster->{bandwidth},
+            requests => $cluster->{requests},
+            cname => $cluster->{cname},

             ipv4 => $cluster->{ipv4},
             ipv6 => $cluster->{ipv6}
         };
             ipv4 => $cluster->{ipv4},
             ipv6 => $cluster->{ipv6}
         };


@@ -73,7 +73,7 @@ if ($ENV{STATUSCAKE_USERNAME} && $ENV{STATUSCAKE_APIKEY})
 
     if (-f "statuscake.yml")
     {
 
     if (-f "statuscake.yml")
     {

-        $cache = YAML::LoadFile("statuscake.yml");
+        $cache = LoadFile("statuscake.yml");

     }
     else
     {
     }
     else
     {


@@ -120,7 +120,8 @@ if ($ENV{STATUSCAKE_USERNAME} && $ENV{STATUSCAKE_APIKEY})
         }
     }
 
         }
     }
 

-    YAML::DumpFile("statuscake.yml", $cache);
+    DumpFile("statuscake-$$.yml", $cache);
+    rename("statuscake-$$.yml", "statuscake.yml");

 }
 
 # Mark a cluster as up if any servers are up
 }
 
 # Mark a cluster as up if any servers are up


@@ -132,7 +133,7 @@ foreach my $server (@servers)
     }
     else
     {
     }
     else
     {

-        $server->{cluster}->{bandwidth} = $server->{cluster}->{bandwidth} - $server->{bandwidth};
+        $server->{cluster}->{requests} = $server->{cluster}->{requests} - $server->{requests};

     }
 }
 
     }
 }
 


@@ -142,15 +143,17 @@ my $targetorigins = {};
 # Initialise cluster details
 while (my($name,$cluster) = each %$clusters)
 {
 # Initialise cluster details
 while (my($name,$cluster) = each %$clusters)
 {

-    $cluster->{bandwidth_limit} = $cluster->{bandwidth} * 1024 * 1024;
-    $cluster->{bandwidth_used} = 0;
+    $cluster->{requests_limit} = $cluster->{requests};
+    $cluster->{requests_used} = 0;
+
+    next if $cluster->{global};

 
     $targetorigins->{$cluster->{name}} = {
         code => $cluster->{name},
         name => $cluster->{name},
         lat => $cluster->{lat},
         lon => $cluster->{lon},
 
     $targetorigins->{$cluster->{name}} = {
         code => $cluster->{name},
         name => $cluster->{name},
         lat => $cluster->{lat},
         lon => $cluster->{lon},

-        bandwidth => 0
+        requests => 0

     };
 }
 
     };
 }
 


@@ -166,7 +169,16 @@ foreach my $origin (values %$origins)
         if ($cluster->{status} eq "up" && $match ne "denied")
         {
             my $priority = $match eq "preferred" ? 20 : 10;
         if ($cluster->{status} eq "up" && $match ne "denied")
         {
             my $priority = $match eq "preferred" ? 20 : 10;

-            my $distance = distance($origin->{lat}, $origin->{lon}, $cluster->{lat}, $cluster->{lon});
+            my $distance;
+
+            if ($cluster->{global})
+            {
+                $distance = 0;
+            }
+            else
+            {
+                $distance = distance($origin->{lat}, $origin->{lon}, $cluster->{lat}, $cluster->{lon});
+            }

 
             push @mappings, {
                 origin => $origin, cluster => $cluster,
 
             push @mappings, {
                 origin => $origin, cluster => $cluster,


@@ -180,7 +192,7 @@ foreach my $origin (values %$origins)
 allocate_clusters(@mappings);
 
 # If we failed to allocate every origin then loop, increasing
 allocate_clusters(@mappings);
 
 # If we failed to allocate every origin then loop, increasing

-# the bandwidth for each cluster by a little and retrying until
+# the requests for each cluster by a little and retrying until

 # we manage to allocate everything
 while (grep { !exists($_->{cluster}) } values %$origins)
 {
 # we manage to allocate everything
 while (grep { !exists($_->{cluster}) } values %$origins)
 {


@@ -190,11 +202,11 @@ while (grep { !exists($_->{cluster}) } values %$origins)
         delete $origin->{cluster};
     }
 
         delete $origin->{cluster};
     }
 

-    # Reset bandwidth usage for clusters and increase limits by 10%
+    # Reset requests usage for clusters and increase limits by 10%

     foreach my $cluster (values %$clusters)
     {
     foreach my $cluster (values %$clusters)
     {

-        $cluster->{bandwidth_used} = 0;
-        $cluster->{bandwidth_limit} = $cluster->{bandwidth_limit} * 1.1;
+        $cluster->{requests_used} = 0;
+        $cluster->{requests_limit} = $cluster->{requests_limit} * 1.1;

     }
 
     # Try the allocate again
     }
 
     # Try the allocate again


@@ -205,20 +217,24 @@ while (grep { !exists($_->{cluster}) } values %$origins)
 my @json;
 
 # Open output files
 my @json;
 
 # Open output files

-my $zonefile = IO::File->new("> data/${zone}") || die "$!";
-my $jszonefile = IO::File->new("> include/${jszone}.js") || die "$!";
-my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
+my $zonefile = IO::File->new("> include/${zone}.js") || die "$!";
+my $jsonfile = IO::File->new("> json/${zone}.openstreetmap.org.json") || die "$!";

 
 # Output headers
 
 # Output headers

-$jszonefile->print("var \U${jszone}\E_RECORDS = [\n");
+$zonefile->print("var \U${zone}\E_RECORDS = [\n");

 
 

-# Skip outputting server map if gdnsd is doing that
-if (!defined($gdnsname))
+# Output details for each country
+foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)

 {
 {

-    # Output details for each country
-    foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
+    my $cluster = $origin->{cluster};
+
+    if (!defined($gdnsname))
+    {
+        $zonefile->print("  CNAME(\"\L$origin->{code}\E.${zone}\", \"$cluster->{name}.${zone}.openstreetmap.org.\", TTL(\"10m\")),\n");
+    }
+
+    if ($cluster->{lon} && $cluster->{lat})

     {
     {

-        my $cluster = $origin->{cluster};

         my $clon = $origin->{lon};
         my $clat = $origin->{lat};
         my $slon = $cluster->{lon};
         my $clon = $origin->{lon};
         my $clat = $origin->{lat};
         my $slon = $cluster->{lon};


@@ -233,11 +249,6 @@ if (!defined($gdnsname))
             $clon = $clon + 360;
         }
 
             $clon = $clon + 360;
         }
 

-        $zonefile->print("# $origin->{name}\n");
-        $zonefile->print("C\L$origin->{code}\E.${zone}:$cluster->{name}.${zone}:600\n");
-
-        $jszonefile->print("  CNAME(\"\L$origin->{code}\E.${jszone}\", \"$cluster->{name}.${zone}.\", TTL(\"10m\")),\n");
-

         push @json, {
             type => "Feature",
             geometry => {
         push @json, {
             type => "Feature",
             geometry => {


@@ -250,13 +261,16 @@ if (!defined($gdnsname))
                 colour => $cluster->{colour}
             }
         };
                 colour => $cluster->{colour}
             }
         };

-
-        $targetorigins->{$cluster->{name}}->{bandwidth} += $origin->{bandwidth};

     }
 
     }
 

-    # Header for default records
-    $zonefile->print("# Unknown origins\n");
+    next if $cluster->{global};
+
+    $targetorigins->{$cluster->{name}}->{requests} += $origin->{requests};
+}

 
 

+# Skip default records if we don't need them
+if (!defined($gdnsname))
+{

     # Output default records for IPs that can't be mapped to a country
     foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
     {
     # Output default records for IPs that can't be mapped to a country
     foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
     {


@@ -264,28 +278,27 @@ if (!defined($gdnsname))
 
         if (my $default = $cluster->{default})
         {
 
         if (my $default = $cluster->{default})
         {

-            output_server($zonefile, $jszonefile, "${default}.${zone}", "${default}.${jszone}", $cluster);
+            output_server($zonefile, "${default}.${zone}", $cluster, 0);

         }
         elsif (exists($cluster->{default}))
         {
         }
         elsif (exists($cluster->{default}))
         {

-            output_server($zonefile, $jszonefile, "${zone}", "${jszone}", $cluster);
+            output_server($zonefile, "${zone}", $cluster, 0);

         }
     }
 }
 
         }
     }
 }
 

-# Header for underlying servers
-$zonefile->print("# Servers\n");
-

 # Output A records for each cluster
 foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
 {
     my $name = $cluster->{name};
 
 # Output A records for each cluster
 foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
 {
     my $name = $cluster->{name};
 

-    output_server($zonefile, $jszonefile, "${name}.${zone}", "${name}.${jszone}", $cluster);
-

     if (@{$cluster->{servers}} > 1)
     {
     if (@{$cluster->{servers}} > 1)
     {

-        output_server($zonefile, $jszonefile, "${name}-%02d.${zone}", "${name}-%02d.${jszone}", $cluster);
+        output_server($zonefile, "${name}-%02d.${zone}", $cluster, 1);
+    }
+    else
+    {
+        output_server($zonefile, "${name}.${zone}", $cluster, 1);

     }
 }
 
     }
 }
 


@@ -293,11 +306,10 @@ foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
 $jsonfile->print(encode_json(\@json));
 
 # Output footers
 $jsonfile->print(encode_json(\@json));
 
 # Output footers

-$jszonefile->print("];\n");
+$zonefile->print("];\n");

 
 # Close the output files
 
 # Close the output files

-$jsonfile->close();
-$jszonefile->close();
+$zonefile->close();

 $zonefile->close();
 
 # Output gdnsd configuration
 $zonefile->close();
 
 # Output gdnsd configuration


@@ -346,7 +358,7 @@ if (defined($gdnsname))
     {
         my $name = $cluster->{name};
 
     {
         my $name = $cluster->{name};
 

-        if (@{$cluster->{servers}} > 1)
+        if (@{$cluster->{servers}} > 1 && grep { $_->{status} eq "up" } @{$cluster->{servers}})

         {
             $gdnsweightedfile->print("${name} => {\n");
 
         {
             $gdnsweightedfile->print("${name} => {\n");
 


@@ -355,9 +367,16 @@ if (defined($gdnsname))
                 if ($server->{status} eq "up")
                 {
                     my $number = sprintf("%02d", $index + 1);
                 if ($server->{status} eq "up")
                 {
                     my $number = sprintf("%02d", $index + 1);

-                    my $bandwidth = $server->{bandwidth};
-
-                    $gdnsweightedfile->print("  ${name}-${number} = [ ${name}-${number}.${zone}., ${bandwidth} ]\n");
+                    my $requests = $server->{requests};
+
+                    if (my $cname = $server->{cname})
+                    {
+                        $gdnsweightedfile->print("  ${name}-${number} = [ ${cname}., ${requests} ]\n");
+                    }
+                    else
+                    {
+                        $gdnsweightedfile->print("  ${name}-${number} = [ ${name}-${number}.${zone}.openstreetmap.org., ${requests} ]\n");
+                    }

                 }
             }
 
                 }
             }
 


@@ -365,9 +384,13 @@ if (defined($gdnsname))
 
             $gdnsresourcefile->print("    ${name} => %weighted!${name}\n");
         }
 
             $gdnsresourcefile->print("    ${name} => %weighted!${name}\n");
         }

+        elsif (my $cname = $cluster->{cname})
+        {
+            $gdnsresourcefile->print("    ${name} => ${cname}.\n");
+        }

         else
         {
         else
         {

-            $gdnsresourcefile->print("    ${name} => ${name}.${zone}.\n");
+            $gdnsresourcefile->print("    ${name} => ${name}.${zone}.openstreetmap.org.\n");

         }
     }
 
         }
     }
 


@@ -380,7 +403,7 @@ if (defined($gdnsname))
 }
 
 # Output the target details in origin format if required
 }
 
 # Output the target details in origin format if required

-YAML::DumpFile($targetoriginfile, $targetorigins) if $targetoriginfile;
+DumpFile($targetoriginfile, $targetorigins) if $targetoriginfile;

 
 exit 0;
 
 
 exit 0;
 


@@ -474,7 +497,7 @@ sub allocate_clusters
     my @mappings = sort { compare_mappings($a, $b) } @_;
 
     # Loop over the mappings, trying to assign each origin to the
     my @mappings = sort { compare_mappings($a, $b) } @_;
 
     # Loop over the mappings, trying to assign each origin to the

-    # nearest cluster, but subject to the bandwidth limits
+    # nearest cluster, but subject to the request limits

     while (my $mapping = shift @mappings)
     {
         my @group;
     while (my $mapping = shift @mappings)
     {
         my @group;


@@ -486,16 +509,16 @@ sub allocate_clusters
             push @group, shift @mappings;
         }
 
             push @group, shift @mappings;
         }
 

-        for my $mapping (sort compare_bandwidth @group)
+        for my $mapping (sort compare_requests @group)

         {
             my $origin = $mapping->{origin};
             my $cluster = $mapping->{cluster};
 
             if (!exists($origin->{cluster}) &&
         {
             my $origin = $mapping->{origin};
             my $cluster = $mapping->{cluster};
 
             if (!exists($origin->{cluster}) &&

-                $cluster->{bandwidth_used} + $origin->{bandwidth} <= $cluster->{bandwidth_limit})
+                $cluster->{requests_used} + $origin->{requests} <= $cluster->{requests_limit})

             {
                 $origin->{cluster} = $cluster;
             {
                 $origin->{cluster} = $cluster;

-                $cluster->{bandwidth_used} = $cluster->{bandwidth_used} + $origin->{bandwidth};
+                $cluster->{requests_used} = $cluster->{requests_used} + $origin->{requests};

             }
         }
     }
             }
         }
     }


@@ -518,10 +541,10 @@ sub compare_mappings
 #
 # Compare two mappings to decide which to try first
 #
 #
 # Compare two mappings to decide which to try first
 #

-sub compare_bandwidth
+sub compare_requests

 {
 {

-    my $a_used = ( $a->{cluster}->{bandwidth_used} * 100.0 ) / ( $a->{cluster}->{bandwidth_limit} * 1.0 );
-    my $b_used = ( $b->{cluster}->{bandwidth_used} * 100.0 ) / ( $b->{cluster}->{bandwidth_limit} * 1.0 );
+    my $a_used = ( $a->{cluster}->{requests_used} * 100.0 ) / ( $a->{cluster}->{requests_limit} * 1.0 );
+    my $b_used = ( $b->{cluster}->{requests_used} * 100.0 ) / ( $b->{cluster}->{requests_limit} * 1.0 );

 
     return $a_used <=> $b_used;
 }
 
     return $a_used <=> $b_used;
 }


@@ -532,26 +555,22 @@ sub compare_bandwidth
 sub output_server
 {
     my $zonefile = shift;
 sub output_server
 {
     my $zonefile = shift;

-    my $jszonefile = shift;

     my $name = shift;
     my $name = shift;

-    my $jsname = shift;

     my $cluster = shift;
     my $cluster = shift;

+    my $all = shift;

 
     while (my($index,$server) = each @{$cluster->{servers}})
     {
 
     while (my($index,$server) = each @{$cluster->{servers}})
     {

-        if ($server->{status} eq "up")
+        if ($all || $server->{status} eq "up")

         {
         {

-            $zonefile->printf("+${name}:$server->{ipv4}:600\n", $index + 1);
-            $jszonefile->printf("  A(\"${jsname}\", \"$server->{ipv4}\", TTL(\"10m\")),\n", $index + 1);
+            if ($server->{ipv4})
+            {
+                $zonefile->printf("  A(\"${name}\", \"$server->{ipv4}\", TTL(\"10m\")),\n", $index + 1);
+            }

 
             if ($server->{ipv6})
             {
 
             if ($server->{ipv6})
             {

-                my $ipv6 = $server->{ipv6};
-
-                $ipv6 =~ s/([0-9a-f]{4})(?=.)/$1:/ig;
-
-                $zonefile->printf("3${name}:$server->{ipv6}:600\n", $index + 1);
-                $jszonefile->printf("  AAAA(\"${jsname}\", \"${ipv6}\", TTL(\"10m\")),\n", $index + 1);
+                $zonefile->printf("  AAAA(\"${name}\", \"$server->{ipv6}\", TTL(\"10m\")),\n", $index + 1);

             }
         }
     }
             }
         }
     }