github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix path used to load the embedded geoip database (LOGSTASH-734)

Browse source
This commit is contained in:
Jordan Sissel 2013-01-03 14:49:34 -08:00
parent 46712eb832
commit 47a8ace6a9
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/logstash/filters/geoip.rb
View file

@ -31,7 +31,7 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
if @database.nil?
if __FILE__ =~ /^file:\/.+!.+/
# Running from a jar, assume GeoLiteCity.dat is at the root.
@database = [__FILE__.split("!").first, "GeoLiteCity.dat"].join("!")
@database = [__FILE__.split("!").first, "/GeoLiteCity.dat"].join("!")
else
if File.exists?("GeoLiteCity.dat")
@database = "GeoLiteCity.dat"
@ -40,7 +40,9 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
end
end
end
@logger.info("Using geoip database", :path => @database)
@geoip = ::GeoIP.new(@database)
@geoip_type = case @geoip.database_type
when GeoIP::GEOIP_CITY_EDITION_REV0, GeoIP::GEOIP_CITY_EDITION_REV1
:city