Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 13 insertions, 2 deletions

diff --git a/lib/quiet_opener.rb b/lib/quiet_opener.rb
index 16ea27b8e..c6e259b93 100644
--- a/lib/quiet_opener.rb
+++ b/lib/quiet_opener.rb
@@ -7,8 +7,19 @@ end
 def quietly_try_to_open(url)
     begin
         result = open(url).read.strip
-    rescue OpenURI::HTTPError, SocketError, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET
-        Rails.logger.warn("Unable to open third-party URL #{url}")
+    rescue OpenURI::HTTPError,
+           SocketError,
+           Errno::ETIMEDOUT,
+           Errno::ECONNREFUSED,
+           Errno::EHOSTUNREACH,
+           Errno::ECONNRESET,
+           Timeout::Error => exception
+        e = Exception.new("Unable to open third-party URL #{url}: #{exception.message}")
+        e.set_backtrace(exception.backtrace)
+        if !AlaveteliConfiguration.exception_notifications_from.blank? && !AlaveteliConfiguration.exception_notifications_to.blank?
+            ExceptionNotifier::Notifier.exception_notification(request.env, e).deliver
+        end
+        Rails.logger.warn(e.message)
         result = ""
     end
     return result