Merge remote-tracking branch 'github/pull/396'

[chef.git] / cookbooks / tilecache / templates / default / ohai.rb.erb

diff --git a/cookbooks/tilecache/templates/default/ohai.rb.erb b/cookbooks/tilecache/templates/default/ohai.rb.erb
index 6bf8fc754e961caa8def26d94173ddd6671b8a0d..5647a4528010e54fc8f35dacb6bb6f82455a8e4e 100644 (file)
--- a/cookbooks/tilecache/templates/default/ohai.rb.erb
+++ b/cookbooks/tilecache/templates/default/ohai.rb.erb
@@ -8,7 +8,7 @@ Ohai.plugin(:TileCache) do
     # Find performance reports for last few minutes
     # Add up total time taken to download tile grouped by remote server
     # Remove 1 second per successful time report (de-prioritise new servers)
     # Find performance reports for last few minutes
     # Add up total time taken to download tile grouped by remote server
     # Remove 1 second per successful time report (de-prioritise new servers)

-    # Add 30 seconds per failed time report request
+    # Add 10 seconds per failed time report request

     Dir.glob("/srv/tilecache/data/**/tilecache-*.txt").each do |path|
       if File.mtime(path) > recent
         IO.readlines(path).reverse.take(20).each do |sample|
     Dir.glob("/srv/tilecache/data/**/tilecache-*.txt").each do |path|
       if File.mtime(path) > recent
         IO.readlines(path).reverse.take(20).each do |sample|


@@ -18,9 +18,9 @@ Ohai.plugin(:TileCache) do
             host = Regexp.last_match(3)
 
             if status == 200 then
             host = Regexp.last_match(3)
 
             if status == 200 then

-              times[host] = times.fetch(host, 0) + time - 1
+              times[host] = times.fetch(host, 0) + (time + 1) * (time + 1) - 1

             else
             else

-              times[host] = times.fetch(host, 0) + 30
+              times[host] = times.fetch(host, 0) + 10

             end
           end
         end
             end
           end
         end