X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8865543903caa9cf364f6443c42a4b5600505375..dd7ef37ec023646120358a0a6a7959a392b79f1c:/app/controllers/browse_controller.rb

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index a77b0f94a..9aec1060a 100644
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -4,7 +4,7 @@ class BrowseController < ApplicationController
   before_filter :authorize_web  
   before_filter :set_locale 
   before_filter { |c| c.check_database_readable(true) }
-  around_filter :timeout, :except => [:start]
+  around_filter :web_timeout, :except => [:start]
 
   def start 
   end
@@ -77,20 +77,4 @@ class BrowseController < ApplicationController
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
-
-private
-
-  def timeout
-    SystemTimer.timeout_after(30) do
-      yield
-    end
-  rescue ActionView::TemplateError => ex
-    if ex.original_exception.is_a?(Timeout::Error)
-      render :action => "timeout", :status => :request_timeout
-    else
-      raise
-    end
-  rescue Timeout::Error
-    render :action => "timeout", :status => :request_timeout
-  end
 end