Also check for potential timed out requests when updating - Ref #797

This commit is contained in:
erwanlr
2015-04-03 17:48:59 +01:00
parent dc20ef0754
commit 44207161e6
2 changed files with 9 additions and 3 deletions

View File

@@ -36,7 +36,7 @@ class DbUpdater
url = "#{remote_file_url(filename)}.sha512"
res = Browser.get(url, request_params)
fail DownloadError, res unless res.code == 200
fail DownloadError, res if res.timed_out? || res.code != 200
res.body
end
@@ -72,7 +72,7 @@ class DbUpdater
file_url = remote_file_url(filename)
res = Browser.get(file_url, request_params)
fail DownloadError, res unless res.code == 200
fail DownloadError, res if res.timed_out? || res.code != 200
File.open(file_path, 'wb') { |f| f.write(res.body) }
local_file_checksum(filename)

View File

@@ -10,7 +10,13 @@ class HttpError < StandardError
def failure_details
msg = response.effective_url
msg += response.code == 0 ? " (#{response.return_message})" : " (status: #{response.code})"
if response.code == 0 || response.timed_out?
msg += " (#{response.return_message})"
else
msg += " (status: #{response.code})"
end
msg
end