Use a memory cache for sessions when memcache is not configured

[rails.git] / lib / nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 10eac78e5db335d2d2fe43a3f6514821c20de4d5..97d158cfdf98f10bc47526c0b397f813b0283a8e 100644 (file)
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -3,7 +3,7 @@ module Nominatim
 
   def self.describe_location(lat, lon, zoom = nil, language = nil)
     zoom ||= 14
 
   def self.describe_location(lat, lon, zoom = nil, language = nil)
     zoom ||= 14

-    language ||= http_accept_language.user_preferred_languages.join(',')
+    language ||= http_accept_language.user_preferred_languages.join(",")

 
     Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do
       url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
 
     Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do
       url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"


@@ -12,7 +12,7 @@ module Nominatim
         response = OSM::Timer.timeout(4) do
           REXML::Document.new(Net::HTTP.get(URI.parse(url)))
         end
         response = OSM::Timer.timeout(4) do
           REXML::Document.new(Net::HTTP.get(URI.parse(url)))
         end

-      rescue Exception
+      rescue StandardError

         response = nil
       end
 
         response = nil
       end