From: Tom Hughes <tom@compton.nu>
Date: Sat, 19 Jun 2010 06:51:46 +0000 (+0100)
Subject: Add timeout to describe_location and handle exceptions
X-Git-Tag: live~6271^2~7
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/68368118a63f4d6c2bed18cdf4dce525256b3a41

Add timeout to describe_location and handle exceptions
---

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 68da97dce..5fa021bcf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -44,9 +44,16 @@ module ApplicationHelper
     zoom = zoom || 14
     language = language || request.user_preferred_languages.join(',')
     url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
-    response = REXML::Document.new(Net::HTTP.get(URI.parse(url)))
 
-    if result = response.get_text("reversegeocode/result")
+    begin
+      Timeout::timeout(4) do
+        response = REXML::Document.new(Net::HTTP.get(URI.parse(url)))
+      end
+    rescue Exception
+      response = nil
+    end
+
+    if response and result = response.get_text("reversegeocode/result")
       result.to_s
     else
       "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"