DEV: remove temporary rescue when downloading MaxMindDB

follow-up 8c8c925d1b
This commit is contained in:
Régis Hanol 2019-05-24 15:13:19 +02:00
parent 049561ac49
commit a51e2271af
1 changed files with 18 additions and 22 deletions

View File

@ -25,35 +25,31 @@ class DiscourseIpInfo
end
def self.mmdb_download(name)
begin
FileUtils.mkdir_p(path)
FileUtils.mkdir_p(path)
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
tar_gz_file.binmode
tar_gz_file.write(Net::HTTP.get(uri))
tar_gz_file.close
tar_gz_file = Tempfile.new
tar_gz_file.binmode
tar_gz_file.write(Net::HTTP.get(uri))
tar_gz_file.close
dest = File.join(Dir.tmpdir, "maxmind_#{SecureRandom.hex}")
FileUtils.mkdir_p(dest)
dest = File.join(Dir.tmpdir, "maxmind_#{SecureRandom.hex}")
FileUtils.mkdir_p(dest)
Discourse::Utils.execute_command('tar', '-xzvf', tar_gz_file.path, "-C", dest)
Discourse::Utils.execute_command('tar', '-xzvf', tar_gz_file.path, "-C", dest)
Dir.glob("#{dest}/**/*.mmdb").each do |path|
if path.include?(name)
FileUtils.mv(path, mmdb_path(name))
else
Rails.logger.warn("Skipping unknown mmdb file during ip database update #{path}")
end
Dir.glob("#{dest}/**/*.mmdb").each do |path|
if path.include?(name)
FileUtils.mv(path, mmdb_path(name))
else
Rails.logger.warn("Skipping unknown mmdb file during ip database update #{path}")
end
rescue => e
STDERR.puts("There was an error downloading MaxMindDB (#{name}): #{e}")
ensure
FileUtils.rm_rf(dest) if dest
FileUtils.rm(tar_gz_file) if tar_gz_file
end
ensure
FileUtils.rm_rf(dest) if dest
FileUtils.rm(tar_gz_file) if tar_gz_file
end
def mmdb_load(filepath)