Experimentally increase loadavg cutoff for mapnik export service

[chef.git] / 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 (executable)
new mode 100644 (file)
index ae37fee..b3acb92
--- a/cookbooks/tile/templates/default/export.erb
+++ b/cookbooks/tile/templates/default/export.erb
@@ -60,7 +60,7 @@ if not os.environ.has_key('HTTP_USER_AGENT'):
 loadavg = float(open("/proc/loadavg").readline().split(" ")[0])
 
 # Process the request
-if loadavg > 35.0:
+if loadavg > 70.0:
   # Abort if the load average on the machine is too high
   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.")
@@ -129,21 +129,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()