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

Use a cached copy of maxmine's GeoLite database; fix the filename as well

Browse source
This commit is contained in:
Jordan Sissel 2012-11-10 00:22:51 +00:00
parent 9223dbb584
commit cd1087ac82
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -17,8 +17,8 @@ JRUBYC=$(WITH_JRUBY) jrubyc
ELASTICSEARCH_URL=http://github.com/downloads/elasticsearch/elasticsearch
ELASTICSEARCH=vendor/jar/elasticsearch-$(ELASTICSEARCH_VERSION)
JODA=vendor/jar/joda-time-$(JODA_VERSION)/joda-time-$(JODA_VERSION).jar
GEOIP=vendor/geoip/GeoCityLite.dat
GEOIP_URL=http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
GEOIP=vendor/geoip/GeoLiteCity.dat
GEOIP_URL=http://logstash.objects.dreamhost.com/maxmind/GeoLiteCity-2012-11-09.dat.gz
PLUGIN_FILES=$(shell git ls-files | egrep '^lib/logstash/(inputs|outputs|filters)/' | egrep -v '/(base|threadable).rb$$|/inputs/ganglia/')
QUIET=@
@ -117,8 +117,7 @@ vendor/geoip: | vendor
$(QUIET)mkdir $@
$(GEOIP): | vendor/geoip
$(QUIET)wget -q -O - http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz \
| gzip -dc - > $@
$(QUIET)wget -q -O - $(GEOIP_URL) | gzip -dc - > $@
# Always run vendor/bundle
.PHONY: fix-bundler

4
spec/jar.rb
View file

@ -5,8 +5,8 @@ describe "logstash jar features" do
@jar_root = __FILE__.split("!").first + "!"
end
it "must contain GeoCityLite.dat" do
path = File.join(@jar_root, "GeoCityLite.dat")
it "must contain GeoLiteCity.dat" do
path = File.join(@jar_root, "GeoLiteCity.dat")
insist { File }.exists?(path)
end
end