X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ddac660f3b7cc09a7718f20d1b857b0794d5a4ef..b5188cae0865597462bd6b5068a80ccfceab802a:/app/controllers/api/amf_controller.rb?ds=sidebyside diff --git a/app/controllers/api/amf_controller.rb b/app/controllers/api/amf_controller.rb index 5d45eb070..34a8ff7f1 100644 --- a/app/controllers/api/amf_controller.rb +++ b/app/controllers/api/amf_controller.rb @@ -37,6 +37,8 @@ module Api class AmfController < ApiController + require "timeout" + include Potlatch before_action :check_api_writable @@ -130,7 +132,7 @@ module Api def amf_handle_error_with_timeout(call, rootobj, rootid, &block) amf_handle_error(call, rootobj, rootid) do - OSM::Timer.timeout(Settings.api_timeout, OSM::APITimeoutError, &block) + Timeout.timeout(Settings.api_timeout, OSM::APITimeoutError, &block) end end