X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b3ce6fdeec5679fc40d4594d3ee8e4429fa29e2b..cf682f49b37a533e7e7aa5f8ea879ba970e88490:/app/controllers/application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a53fb5374..c7c6c4add 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -216,6 +216,8 @@ class ApplicationController < ActionController::Base
     raise OSM::APIBadMethodError.new(method) unless ok
   end
 
+  ##
+  # wrap an api call in a timeout
   def api_call_timeout
     SystemTimer.timeout_after(APP_CONFIG['api_timeout']) do
       yield
@@ -224,6 +226,22 @@ class ApplicationController < ActionController::Base
     raise OSM::APITimeoutError
   end
 
+  ##
+  # wrap a web page in a timeout
+  def web_timeout
+    SystemTimer.timeout_after(APP_CONFIG['web_timeout']) do
+      yield
+    end
+  rescue ActionView::TemplateError => ex
+    if ex.original_exception.is_a?(Timeout::Error)
+      render :action => "timeout"
+    else
+      raise
+    end
+  rescue Timeout::Error
+    render :action => "timeout"
+  end
+
   ##
   # extend caches_action to include the parameters, locale and logged in
   # status in all cache keys