X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/160429e62d88810ec49ccc9c504edee675dca080..50224b473bce736436d27c64bd46c1910e4d43ec:/app/controllers/browse_controller.rb

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index d9b18769c..2962c6836 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
@@ -86,20 +86,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"
-    else
-      raise
-    end
-  rescue Timeout::Error
-    render :action => "timeout"
-  end
 end