X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/53618f52a6a71a020f42d3244b94b9f48816d0d8..5c47d954b6d631cba545ba5793c11c1cc90e37ce:/cookbooks/tile/templates/default/export.erb

diff --git a/cookbooks/tile/templates/default/export.erb b/cookbooks/tile/templates/default/export.erb
old mode 100755
new mode 100644
index ae37fee3a..97aa161f6
--- 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
-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
-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"
-  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"
-  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
@@ -129,21 +130,21 @@ else:
         output_headers("image/jpeg", "map.jpg", len(jpeg))
         sys.stdout.write(jpeg)
       elif form.getvalue("format") == "svg":
-        file = tempfile.NamedTemporaryFile()
+        file = tempfile.NamedTemporaryFile(prefix = "export")
         surface = cairo.SVGSurface(file.name, map.width, map.height)
         mapnik.render(map, surface)
         surface.finish()
         output_headers("image/svg+xml", "map.svg", file_size(file))
         output_file(file)
       elif form.getvalue("format") == "pdf":
-        file = tempfile.NamedTemporaryFile()
+        file = tempfile.NamedTemporaryFile(prefix = "export")
         surface = cairo.PDFSurface(file.name, map.width, map.height)
         mapnik.render(map, surface)
         surface.finish()
         output_headers("application/pdf", "map.pdf", file_size(file))
         output_file(file)
       elif form.getvalue("format") == "ps":
-        file = tempfile.NamedTemporaryFile()
+        file = tempfile.NamedTemporaryFile(prefix = "export")
         surface = cairo.PSSurface(file.name, map.width, map.height)
         mapnik.render(map, surface)
         surface.finish()