mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: Ensure TarReader is closed.
This commit is contained in:
@@ -26,23 +26,27 @@ class DiscourseIpInfo
|
|||||||
|
|
||||||
uri = URI("https://geolite.maxmind.com/download/geoip/database/#{name}.tar.gz")
|
uri = URI("https://geolite.maxmind.com/download/geoip/database/#{name}.tar.gz")
|
||||||
|
|
||||||
tar_gz_file = Tempfile.new
|
|
||||||
begin
|
begin
|
||||||
|
tar_gz_file = Tempfile.new
|
||||||
tar_gz_file.binmode
|
tar_gz_file.binmode
|
||||||
tar_gz_file.write(Net::HTTP.get(uri))
|
tar_gz_file.write(Net::HTTP.get(uri))
|
||||||
tar_gz_file.close
|
tar_gz_file.close
|
||||||
|
|
||||||
extractor = Gem::Package::TarReader.new(Zlib::GzipReader.open(tar_gz_file.path))
|
begin
|
||||||
extractor.rewind
|
extractor = Gem::Package::TarReader.new(Zlib::GzipReader.open(tar_gz_file.path))
|
||||||
|
extractor.rewind
|
||||||
|
|
||||||
extractor.each do |entry|
|
extractor.each do |entry|
|
||||||
next unless entry.full_name.ends_with?(".mmdb")
|
next unless entry.full_name.ends_with?(".mmdb")
|
||||||
File.open(mmdb_path(name), "wb") { |f| f.write(entry.read) }
|
File.open(mmdb_path(name), "wb") { |f| f.write(entry.read) }
|
||||||
|
end
|
||||||
|
ensure
|
||||||
|
extractor.close
|
||||||
end
|
end
|
||||||
|
|
||||||
ensure
|
ensure
|
||||||
tar_gz_file.close
|
tar_gz_file.close
|
||||||
tar_gz_file.unlink
|
tar_gz_file.unlink
|
||||||
extractor.close
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user