logstash-codec-multiline 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b89e4a5a454c8bc979aca1a959c06ad2d65e29bc
-  data.tar.gz: 3eff2f29480107e6212eec95c096c18b3f82b55e
+  metadata.gz: cd43c9171bdc01db5f0d381b4c95994e7b6073d4
+  data.tar.gz: 07230a73ec9e7cb9ccddb94921d540323e4d0e86
 SHA512:
-  metadata.gz: d7eb64acd24053b8ce18bfe111a5ab2917f5a41a3e979879ee1313bc64ffcf744ed85d11ade9843167bfe86579a34b8015d62b5fa0ee85d1356a1ac3360d246e
-  data.tar.gz: 36580542f95f5b66d042f8a2e6ed69064b49a1e2c1e2400f0aa49bfeb8f54ec510b99646fc1758d3a9887fb41862d1fd7ad44c30cbf3be721bf73323221953af
+  metadata.gz: 2aec937d4fdf0bbde23c38dee5544198ee8bb5c89efe146bf96b24d4e77bf0f004ba197508168e37f700bd8ebcd913a4719a766b7ce7c7c50ce526b9f9d83623
+  data.tar.gz: 3174e737bc7922cbafec8cda5f1ee85ec9c1691e6918e5e61ab20da35167b6c9969147a4ff869e52057a8385190edd2058699fbc636bf5e69f3b7ccba8a60983

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.4
+ - Add constructional method to allow an eviction specific block to be set.
+
 ## 2.0.3
  - Add pseudo codec IdentityMapCodec.  Support class for identity based multiline processing.
 

data/lib/logstash/codecs/identity_map_codec.rb

@@ -101,7 +101,8 @@ module LogStash module Codecs class IdentityMapCodec
     @max_identities = MAX_IDENTITIES
     @evict_timeout = EVICT_TIMEOUT
     @cleaner = MapCleaner.new(self, CLEANER_INTERVAL)
-    @decode_block = lambda {|*| }
+    @decode_block = lambda {|*| true }
+    @eviction_block = nil
   end
 
   # ==============================================
@@ -126,6 +127,12 @@ module LogStash module Codecs class IdentityMapCodec
     @cleaner = MapCleaner.new(self, interval.to_i)
     self
   end
+
+  # used to add  a non-default eviction block
+  def eviction_block(block)
+    @eviction_block = block
+    self
+  end
   # end Constructional/builder methods
   # ==============================================
 
@@ -184,7 +191,7 @@ module LogStash module Codecs class IdentityMapCodec
     # contents should not mutate during this call
     identity_map.delete_if do |identity, compo|
       if (flag = compo.timeout <= cut_off)
-        compo.codec.flush(&@decode_block)
+        compo.codec.flush(&(@eviction_block || @decode_block))
       end
       flag
     end

data/logstash-codec-multiline.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-multiline'
-  s.version         = '2.0.3'
+  s.version         = '2.0.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The multiline codec will collapse multiline messages and merge them into a single event."
   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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "codec" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0", "< 3.0.0"
 
   s.add_runtime_dependency 'logstash-patterns-core'
   s.add_runtime_dependency 'jls-grok', '~> 0.11.1'

data/spec/codecs/identity_map_codec_spec.rb

@@ -18,7 +18,7 @@ class IdentityMapCodecTracer
   def clone() self.class.new; end
   def decode(data) @tracer.push [:decode, data]; end
   def encode(event) @tracer.push [:encode, event]; end
-  def flush(&block) @tracer.push [:flush, true]; end
+  def flush(&block) @tracer.push [:flush, block.call]; end
   def close() @tracer.push [:close, true]; end
   def logger() @logger ||= LogTracer.new; end
 
@@ -175,7 +175,7 @@ describe LogStash::Codecs::IdentityMapCodec do
           sleep(1.2)
           demuxer.decode(Object.new, "stream2")
           expect(demuxer.identity_count).to eq(limit)
-          expect { demuxer.decode(Object.new, "stream4") }.not_to raise_error
+          expect { demuxer.decode(Object.new, "stream4"){|*| 42 } }.not_to raise_error
         end
       end
     end
@@ -195,12 +195,27 @@ describe LogStash::Codecs::IdentityMapCodec do
   end
 
   describe "codec eviction" do
-    let(:demuxer) { described_class.new(codec).evict_timeout(1).cleaner_interval(1) }
     context "when an identity has become stale" do
+      let(:demuxer) { described_class.new(codec).evict_timeout(1).cleaner_interval(1) }
       it "the cleaner evicts the codec and flushes it first" do
-        demuxer.decode(Object.new, "stream1")
+        demuxer.decode(Object.new, "stream1"){|*| 42}
+        sleep(2.1)
+        expect(codec.trace_for(:flush)).to eq(42)
+        expect(demuxer.identity_map.keys).not_to include("stream1")
+      end
+    end
+
+    context "when an identity has become stale and an evition block is set" do
+      let(:demuxer) do
+        described_class.new(codec)
+        .evict_timeout(1)
+        .cleaner_interval(1)
+        .eviction_block(lambda {|*| 24} )
+      end
+      it "the cleaner evicts the codec and flushes it first using the eviction_block" do
+        demuxer.decode(Object.new, "stream1"){|*| 42}
         sleep(2.1)
-        expect(codec.trace_for(:flush)).to be_truthy
+        expect(codec.trace_for(:flush)).to eq(24)
         expect(demuxer.identity_map.keys).not_to include("stream1")
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-multiline
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -24,7 +24,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -78,18 +78,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/logstash/codecs/identity_map_codec.rb
-- lib/logstash/codecs/multiline.rb
-- spec/codecs/multiline_spec.rb
-- spec/codecs/identity_map_codec_spec.rb
-- spec/supports/helpers.rb
-- logstash-codec-multiline.gemspec
-- README.md
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
+- README.md
+- lib/logstash/codecs/identity_map_codec.rb
+- lib/logstash/codecs/multiline.rb
+- logstash-codec-multiline.gemspec
+- spec/codecs/identity_map_codec_spec.rb
+- spec/codecs/multiline_spec.rb
+- spec/supports/helpers.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -112,11 +112,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: The multiline codec will collapse multiline messages and merge them into a single event.
 test_files:
-- spec/codecs/multiline_spec.rb
 - spec/codecs/identity_map_codec_spec.rb
+- spec/codecs/multiline_spec.rb
 - spec/supports/helpers.rb