From 3aa1c46aef07912f4581bbd35f74a0fa5f42534c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 6 Jan 2012 09:13:52 +0000 Subject: [PATCH] Use OSM::Timer (and hence SystemTimer) consistently --- app/controllers/amf_controller.rb | 2 +- app/helpers/application_helper.rb | 2 +- lib/osm.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 86e57a2d1..139a7a650 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -128,7 +128,7 @@ class AmfController < ApplicationController def amf_handle_error_with_timeout(call,rootobj,rootid) amf_handle_error(call,rootobj,rootid) do - Timeout::timeout(API_TIMEOUT, OSM::APITimeoutError) do + OSM::Timer.timeout(API_TIMEOUT, OSM::APITimeoutError) do yield end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b256dac4c..c7187c31d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -89,7 +89,7 @@ module ApplicationHelper url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" begin - response = Timeout::timeout(4) do + response = OSM::Timer.timeout(4) do REXML::Document.new(Net::HTTP.get(URI.parse(url))) end rescue Exception diff --git a/lib/osm.rb b/lib/osm.rb index a85a7dfec..dd62d6620 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -455,7 +455,7 @@ module OSM end def self.IPToCountry(ip_address) - Timeout::timeout(4) do + Timer.timeout(4) do ipinfo = Quova::IpInfo.new(ip_address) if ipinfo.status == Quova::Success then -- 2.43.2