logstash-filter-empowclassifier 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2b80bd475e12f3e0e88a74a1fa718782e83b26f07b4a89a5c88b625e9adf863
-  data.tar.gz: d4a09d4b8c26ab17e64f3a99ff5dbaf12f6fc18ef7e84acc198b13aa9563ca87
+  metadata.gz: 5fdc06daca07dd3f23c88ea8e939c71ac00971e3dc7cba06a616b54462aec62b
+  data.tar.gz: 755b86a17e1d4ae18bc14d7d4f32c04a6785e52a0873acf94bbe54f8ceb9c589
 SHA512:
-  metadata.gz: 95b93a9f5b54a078d0723c5472513a3f50fbb4e52b16893838f2f69901f982f71f3e9b96297014d29dd3b0664d65090f3030e1e35d64d95579ad357ce10ff81f
-  data.tar.gz: 2c5330ff79e5f2b2f819957a16892459bb48cd6907bd2388101e77d565bf1a4ad6f2b038731c098ef0f1feab7933d33429a8a413ed078b7d66637b6f2504d4f7
+  metadata.gz: 602b67ab1b4e680a7baaaca336f72b8187106e6f90ab4bdab4797fd4bc8145112c42c7cf7076e1468166f93c4d6ad269a4f3f570a0d9eb0b6f5e82a5409a53a1
+  data.tar.gz: a6085a4ca9d744ff670f00346e1fdf00985989106719849ffa3a5e5b5c29cf7d05732c3f15ea5c2396c166d866cb6584ceba8763ef7e6b3f44a60adc562f1e03

data/lib/logstash/filters/center-client.rb

@@ -81,7 +81,7 @@ module LogStash
             begin
               res = classify_online(requests)
             rescue StandardError => e
-              @logger.debug("encountered an unexpected error on the 2nd attempt. #{e}", :error => e)
+              @logger.debug("encountered an unexpected error on the 2nd attempt", :error => e)
 
               error_message = rescue_http_error_result(e)
 
@@ -89,7 +89,7 @@ module LogStash
             end
 
           rescue StandardError => e
-            @logger.error("encountered an unexpected error while query the center. #{e}")
+            @logger.error("encountered an unexpected error while querying the center", :error => e)
 
             error_message = rescue_http_error_result(e)
 

data/lib/logstash/filters/classifier.rb

@@ -271,7 +271,7 @@ module LogStash; module Filters; module Empow;
 				begin
 					results = @online_classifer.classify(batch)
 				rescue StandardError => e
-					@logger.error("bulk request ended with a failure, all requests will be removed from queue", :error => e, :backtrace => e.backtrace)
+					@logger.debug("bulk request ended with a failure, all requests will be removed from queue", :error => e, :backtrace => e.backtrace)
 					
 					batch.each do |req|
 						@requests_queue.delete(request)

data/lib/logstash/filters/empowclassifier.rb

@@ -185,13 +185,13 @@ class LogStash::Filters::EmpowClassifier < LogStash::Filters::Base
       parked_events = @plugin_core.flush(options)
 
       parked_events.each do |event|
-        # need to clone as original event was canceled
-        cloned_event = event.clone
-        events_to_flush << cloned_event
+        event.uncancel
+
+        events_to_flush << event
       end
 
     rescue StandardError => e
-      @logger.error("encountered an exception while processing flush. #{e}")
+      @logger.error("encountered an exception while processing flush", :error => e)
     end
 
     @logger.debug("flush ended", :flushed_event_count => events_to_flush.length)
@@ -206,28 +206,27 @@ class LogStash::Filters::EmpowClassifier < LogStash::Filters::Base
       res = @plugin_core.classify(event)
 
       if res.nil?
-        event.cancel # don't stream this event just yet ...
         return
       end
 
       # event was classified and returned, not some overflow event
       if res.equal? event
-        filter_matched(event) 
+        filter_matched(event)
+
         return
       end
 
       # got here with a parked event
-      res = res.clone
       filter_matched(res)
-      
+
       @logger.debug("filter matched for overflow event", :event => res)
 
+      yield res
+
     rescue StandardError => e
       @logger.error("encountered an exception while classifying", :error => e, :event => event, :backtrace => e.backtrace)
 
       @tag_on_error.each{|tag| event.tag(tag)}
-
-      return res
     end
   end # def filter
 

data/lib/logstash/filters/plugin-logic.rb

@@ -45,8 +45,9 @@ module LogStash; module Filters; module Empow;
 					tuple = @parked_events.shift
 					
 					if !tuple.nil?
-						# todo: consider classifying the unparked event one last time
-						return tuple[:event]
+						unparked_event = tuple[:event]
+						unparked_event.uncancel
+						return unparked_event
 					end
 				end
 
@@ -152,6 +153,8 @@ module LogStash; module Filters; module Empow;
 			tuple[:time] = Time.now
 
 			@parked_events << tuple
+
+			event.cancel # don't stream this event just yet ...
 		end
 		
 		private

data/logstash-filter-empowclassifier.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-empowclassifier'
-  s.version       = '0.3.15'
+  s.version       = '0.3.16'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Logstash intent classification plugin client for accessing empow''s classifiction cloud'
   #s.description   = 'Write a longer description or delete this line.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-empowclassifier
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - empow
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement