logstash-filter-geoip 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65ae4ed21b459fa2df87da70fb069ecaba4d6175
-  data.tar.gz: 845a47c02f6a2e5d2970dd2b1c7f3b15cab81e0f
+  metadata.gz: 2eaa1e5ff884efafae5b77c95a48ffebd01d748f
+  data.tar.gz: ff2e4b0075b59bbf1f0bb91b2c1f1deb82634e0a
 SHA512:
-  metadata.gz: afec25e89ce13584cccc90b9fb11675d9444e4c1d4e10db879382905d0225d67c437f8a076b7b3cd8500d4c59750d0dc800e74358d231a871d4ea3f1edaae3e6
-  data.tar.gz: 20274d8df82fdf5c99ee26f2e3f4762a0da7ab892fea19409138b7e190c98c7be4250317742f8b7fc16f4dfe9f82b57e6a536202aec7ec77a498c3ffd32caa27
+  metadata.gz: 345da04886c00b470efa6536ef05b9c5f8c323a89a6bff2cb9b56191c798e654f2051c1772c72f8db427e1a8a95b60f1e4166f5eeed1dd93cd3094553d4da6e4
+  data.tar.gz: 8ea38b8fd0c13647c5dacea82cf7b04c9b9b901857b9a48f2bfea907e67cce35e0749e9a5bc76349ae08d76409b5712ac8393059d47119931ef231634b1d7dff

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+* 1.1.2
+  - Be more defensive with threadsafety, mostly for specs
 * 1.1.1
   - Lazy-load LRU cache
 * 1.1.0

data/lib/logstash/filters/geoip.rb

@@ -28,6 +28,7 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
   LOOKUP_CACHES = {}
 
   attr_accessor :lookup_cache
+  attr_reader :threadkey
 
   config_name "geoip"
 
@@ -124,15 +125,6 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
     return unless filter?(event)
     geo_data = nil
 
-    # Use thread-local access to GeoIP. The Ruby GeoIP module forces a mutex
-    # around access to the database, which can be overcome with :pread.
-    # Unfortunately, :pread requires the io-extra gem, with C extensions that
-    # aren't supported on JRuby. If / when :pread becomes available, we can stop
-    # needing thread-local access.
-    if !Thread.current.key?(@threadkey)
-      Thread.current[@threadkey] = ::GeoIP.new(@database)
-    end
-
     geo_data = get_geo_data(event)
 
     return if geo_data.nil? || !geo_data.respond_to?(:to_hash)
@@ -181,12 +173,22 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
   end
 
   def get_geo_data_for_ip(ip)
+    ensure_database!
     if (cached = lookup_cache[ip])
       cached
     else
-      geo_data = Thread.current[@threadkey].send(@geoip_type, ip)
+      geo_data = Thread.current[threadkey].send(@geoip_type, ip)
       lookup_cache[ip] = geo_data
       geo_data
     end
   end
+
+  def ensure_database!
+    # Use thread-local access to GeoIP. The Ruby GeoIP module forces a mutex
+    # around access to the database, which can be overcome with :pread.
+    # Unfortunately, :pread requires the io-extra gem, with C extensions that
+    # aren't supported on JRuby. If / when :pread becomes available, we can stop
+    # needing thread-local access.
+    Thread.current[threadkey] ||= ::GeoIP.new(@database)
+  end
 end # class LogStash::Filters::GeoIP

data/logstash-filter-geoip.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-geoip'
-  s.version         = '1.1.1'
+  s.version         = '1.1.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "$summary"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

data/spec/filters/geoip_spec.rb

@@ -246,4 +246,19 @@ describe LogStash::Filters::GeoIP do
       end
     end
   end
+
+  describe "re-initializing thread current DB" do
+    let(:plugin) { LogStash::Filters::GeoIP.new("source" => "message") }
+
+    before do
+      plugin.register
+    end
+
+    it "should initialize the DB on lookup, regardless of thread state" do
+      Thread.current[plugin.threadkey] = nil
+      expect {
+        plugin.get_geo_data_for_ip("8.8.8.8")
+      }.not_to raise_error
+    end
+  end
 end

metadata

@@ -1,94 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-geoip
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: geoip
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
-  name: geoip
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: lru_redux
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
-- !ruby/object:Gem::Dependency
+        version: 1.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-  name: lru_redux
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/logstash/filters/geoip.rb
+- spec/filters/geoip_spec.rb
+- vendor/GeoLiteCity-2013-01-18.dat
+- vendor/GeoIPASNum-2014-02-12.dat
+- logstash-filter-geoip.gemspec
+- README.md
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
-- README.md
-- lib/logstash/filters/geoip.rb
-- logstash-filter-geoip.gemspec
-- spec/filters/geoip_spec.rb
-- vendor/GeoIPASNum-2014-02-12.dat
-- vendor/GeoLiteCity-2013-01-18.dat
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -101,20 +101,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
-summary: "$summary"
+summary: $summary
 test_files:
 - spec/filters/geoip_spec.rb
-has_rdoc: