github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 09:12:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: improve error handling for missing maxmind dbs

Browse Source 
Correct issue where we kept on looking up data on a Logster::Message object
This commit is contained in:
Sam 2018-10-31 12:57:18 +11:00
parent 32b1f34910
commit 31ad7a60ab
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/discourse_ip_info.rb
View File

@ -18,9 +18,11 @@ class DiscourseIpInfo
begin
MaxMindDB.new(filepath, MaxMindDB::LOW_MEMORY_FILE_READER)
rescue Errno::ENOENT => e
Rails.logger.warn("MaxMindDB could not be found: #{e}")
rescue
Rails.logger.warn("MaxMindDB could not be loaded.")
Rails.logger.warn("MaxMindDB (#{filepath}) could not be found: #{e}")
nil
rescue => e
Discourse.warn_exception(e, "MaxMindDB (#{filepath}) could not be loaded.")
nil
end
end
@ -39,8 +41,8 @@ class DiscourseIpInfo
ret[:longitude] = result.location.longitude
ret[:location] = [ret[:city], ret[:region], ret[:country]].reject(&:blank?).join(", ")
end
rescue
Rails.logger.error("IP #{ip} could not be looked up in MaxMind GeoLite2-City database.")
rescue => e
Discourse.warn_exception(e, "IP #{ip} could not be looked up in MaxMind GeoLite2-City database.")
end
end
@ -52,8 +54,8 @@ class DiscourseIpInfo
ret[:asn] = result["autonomous_system_number"]
ret[:organization] = result["autonomous_system_organization"]
end
rescue
Rails.logger.error("IP #{ip} could not be looked up in MaxMind GeoLite2-ASN database.")
rescue => e
Discourse.warn_exception(e, "IP #{ip} could not be looked up in MaxMind GeoLite2-ASN database.")
end
end