Revert "palulukon: Allow access to AWS IP metadata NTP service"

[chef.git] / cookbooks / web / templates / default / api-statistics.erb

diff --git a/cookbooks/web/templates/default/api-statistics.erb b/cookbooks/web/templates/default/api-statistics.erb
index 297a2ef514f50a3e3a00523b8ab5480b90544958..ce3af0b3430275a258e413236220ea0680dfaa96 100644 (file)
--- a/cookbooks/web/templates/default/api-statistics.erb
+++ b/cookbooks/web/templates/default/api-statistics.erb
@@ -34,7 +34,7 @@ statistics = {
 
 File::Tail::Logfile.tail("/var/log/apache2/access.log") do |line|
   begin
 
 File::Tail::Logfile.tail("/var/log/apache2/access.log") do |line|
   begin

-    hash = parser.parse(line)
+    hash = parser.parse!(line)

 
     uri = categorise_uri(hash["%r"])
     status = hash["%>s"]
 
     uri = categorise_uri(hash["%r"])
     status = hash["%>s"]


@@ -51,8 +51,8 @@ File::Tail::Logfile.tail("/var/log/apache2/access.log") do |line|
     statistics[:seconds][[uri, status]] += seconds
     statistics[:ssl][[protocol, cipher]] += 1 unless protocol == "-"
     statistics[:auth][auth] += 1 unless auth == "-"
     statistics[:seconds][[uri, status]] += seconds
     statistics[:ssl][[protocol, cipher]] += 1 unless protocol == "-"
     statistics[:auth][auth] += 1 unless auth == "-"

-  rescue ApacheLogRegex::ParseError
-    # nil
+  rescue ApacheLogRegex::ParseError => ex
+    STDERR.puts ex.to_s

   end
 
   if Time.now - last_write > 10
   end
 
   if Time.now - last_write > 10