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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 96cec3943..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,14 +77,4 @@ class BrowseController < ApplicationController
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
-
-private
-
-  def timeout
-    Timeout::timeout(30) do
-      yield
-    end
-  rescue Timeout::Error
-    render :action => "timeout", :status => :request_timeout
-  end
 end