X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e3cbeeae9453a0108733316e5119d0038abab760..8197ab3f82f343dd305b817e7676647354d0aea5:/config/initializers/abstract_adapter.rb

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 7b22a3cc6..5cc24d25c 100644
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -13,8 +13,10 @@ module ActiveRecord
           old_log(sql, name)
         end
       rescue ActiveRecord::StatementInvalid => ex
-        if ex =~ /^OSM::APITimeoutError: /
-          raise OSM::APITimeoutError
+        if ex.message =~ /^OSM::APITimeoutError: /
+          raise OSM::APITimeoutError.new
+        elsif ex.message =~ /^Timeout::Error: /
+          raise Timeout::Error.new("time's up!")
         else
           raise
         end