Remove old code to exit after 10000 requests as the memory limit code

should do a better job of controlling things.

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index ca4cbcbd7c3439304a6ed38179c25c6fb2ad6bfa..855e05888cddf1ee189b899482de5ac3e00fdd6f 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -7,9 +7,6 @@ class ApiController < ApplicationController
   # Help methods for checking boundary sanity and area size
   include MapBoundary
 
-  #COUNT is the number of map requests to allow before exiting and starting a new process
-  @@count = COUNT
-
   # The maximum area you're allowed to request, in square degrees
   MAX_REQUEST_AREA = APP_CONFIG['max_request_area']
 
@@ -73,13 +70,6 @@ class ApiController < ApplicationController
       trkseg << point.to_xml_node()
     end
 
-    #exit when we have too many requests
-    if @@count > MAX_COUNT
-      render :text => doc.to_s, :content_type => "text/xml"
-      @@count = COUNT
-      exit!
-    end
-
     response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
 
     render :text => doc.to_s, :content_type => "text/xml"
@@ -206,13 +196,6 @@ class ApiController < ApplicationController
     response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
 
     render :text => doc.to_s, :content_type => "text/xml"
-    
-    #exit when we have too many requests
-    if @@count > MAX_COUNT
-      @@count = COUNT
-      
-      exit!
-    end
   end
 
   # Get a list of the tiles that have changed within a specified time

diff --git a/config/initializers/limits.rb b/config/initializers/limits.rb
index 1ce493dfbeaa6dcebd0b91522e2c60ab81c30236..9862036f7f2646a0a426d0f5470c15eb5f5e49e7 100644 (file)
--- a/config/initializers/limits.rb
+++ b/config/initializers/limits.rb
@@ -2,7 +2,3 @@
 if Process.const_defined?(:RLIMIT_AS)
   Process.setrlimit Process::RLIMIT_AS, 1024*1024*1024, Process::RLIM_INFINITY
 end
-
-# Force a restart after every 10000 requests
-COUNT = 0
-MAX_COUNT = 10000