Rework firewall rule handling

[chef.git] / cookbooks / tile / templates / default / export.erb

diff --git a/cookbooks/tile/templates/default/export.erb b/cookbooks/tile/templates/default/export.erb
index d178df4ced64b10c68f4efe86b5ce9f698cd5009..97aa161f66a06596ceed18dfdc45fd5892add5eb 100644 (file)
--- a/cookbooks/tile/templates/default/export.erb
+++ b/cookbooks/tile/templates/default/export.erb
@@ -57,18 +57,19 @@ if not os.environ.has_key('HTTP_USER_AGENT'):
   os.environ['HTTP_USER_AGENT'] = 'NONE'
 
 # Get the load average
   os.environ['HTTP_USER_AGENT'] = 'NONE'
 
 # Get the load average

-loadavg = float(open("/proc/loadavg").readline().split(" ")[0])
+cputimes = [float(n) for n in open("/proc/stat").readline().rstrip().split()[1:-1]]
+idletime = cputimes[3] / sum(cputimes)

 
 # Process the request
 
 # Process the request

-if loadavg > 35.0:
-  # Abort if the load average on the machine is too high
+if idletime < 0.2:
+  # Abort if the CPU idle time on the machine is too low

   print "Status: 503 Service Unavailable"
   print "Status: 503 Service Unavailable"

-  output_error("The load average on the server is too high at the moment. Please wait a few minutes before trying again.")
+  output_error("The server is too busy at the moment. Please wait a few minutes before trying again.")

 <% @blocks["user_agents"].each do |user_agent| -%>
 elif os.environ['HTTP_USER_AGENT'] == '<%= user_agent %>':
   # Block scraper
   print "Status: 503 Service Unavailable"
 <% @blocks["user_agents"].each do |user_agent| -%>
 elif os.environ['HTTP_USER_AGENT'] == '<%= user_agent %>':
   # Block scraper
   print "Status: 503 Service Unavailable"

-  output_error("The load average on the server is too high at the moment. Please wait a few minutes before trying again.")
+  output_error("The server is too busy at the moment. Please wait a few minutes before trying again.")

 <% end -%>
 elif not form.has_key("bbox"):
   # No bounding box specified
 <% end -%>
 elif not form.has_key("bbox"):
   # No bounding box specified