X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/5314f32a223d04a13d80ad3f3bd98b543d26733e..e80b3455187e180528359ecfc31a04f39d468738:/bin/sumlogs

diff --git a/bin/sumlogs b/bin/sumlogs
index c46bcba..7096bde 100755
--- a/bin/sumlogs
+++ b/bin/sumlogs
@@ -7,12 +7,13 @@ use Geo::IP;
 use YAML;
 
 my $gi = Geo::IP->open("/usr/share/GeoIP/GeoIP.dat", GEOIP_MEMORY_CACHE);
+my $total_bandwidth = 560 * 1024 * 1024;
 my $total_bytes = 0;
 my %country_bytes;
 
 while (my $record = <>)
 {
-    if ($record =~ /^\d+\.\d+\s+\d+\s+(\d+\.\d+\.\d+\.\d+)\s+TCP_[A-Z_]+\/\d+\s+(\d+) (?:GET|HEAD|POST|OPTIONS|PROPFIND) /)
+    if ($record =~ /^\d+\.\d+\s+\S+\s+".*"\s+(\d+\.\d+\.\d+\.\d+)\s+".*"\s+(\d+)$/)
     {
         my $ip = $1;
         my $bytes = $2;
@@ -27,14 +28,6 @@ while (my $record = <>)
 
         $total_bytes += $bytes;
     }
-    elsif ($record =~ /^\d+\.\d+\s+\d+\s+(\d+\.\d+\.\d+\.\d+)\s+TCP_DENIED\/\d+\s+(\d+) /)
-    {
-	# do nothing
-    }
-    elsif ($record =~ /^\d+\.\d+\s+\d+\s+(\d+\.\d+\.\d+\.\d+)\s+UDP_[A-Z_]+\/\d+\s+(\d+) ICP_QUERY /)
-    {
-	# do nothing
-    }
     else
     {
         warn $record;
@@ -45,7 +38,7 @@ my %country_bandwidth;
 
 while (my($country,$bytes) = each %country_bytes)
 {
-    $country_bandwidth{$country} = $bytes * 300 * 1024 * 1024 / $total_bytes;
+    $country_bandwidth{$country} = $bytes * $total_bandwidth / $total_bytes;
 }
 
 print Dump(\%country_bandwidth);