logstash-core-event-java 5.0.0.alpha6.snapshot1-java → 5.0.0.alpha6.snapshot2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99f144b8a21a12f11307862e00a528ab09395584
-  data.tar.gz: 461b0b304e322816d0541a973a6a3ea1439d1824
+  metadata.gz: d1387a75d98e940027af5034b31b876f82799643
+  data.tar.gz: 60c8731f4dc1680a2555f4b541dc583a8d347f85
 SHA512:
-  metadata.gz: ec6c2046f05bdd9baf3268c8b963930fb09c42df23e9cd5b5c38278b5cfb9055954422ba5720789cd5a67ae43a32d6224989bc6362f542f73785f033cfca575b
-  data.tar.gz: 90977b55ed0abf0120a19a15cb478ec54ca39bd0126163aa623ab63595bbd7b8a19bab10e596439d7ac16c00f7b94f8599b25eefae31fbc4ca810dcbbba5455b
+  metadata.gz: 35600341c26ba7092837511656281532185c0583ddaad4bdd2c548175b45ef7800f74dcbb191014b0a492f49ca37a092730a841cd937fe2e86c0eb34cc87e927
+  data.tar.gz: dfa30f2561e5559271e30a8873178a1401723c9689dcc4753bca51a0c50047fc3b7b93101d2fc14ea99eb95637ab963a6baff5a9d01ddb047c3372de9bd273e7

data/lib/logstash/event.rb

@@ -3,21 +3,32 @@
 require "logstash/namespace"
 require "logstash/json"
 require "logstash/string_interpolation"
-require "cabin"
 
 # transcient pipeline events for normal in-flow signaling as opposed to
 # flow altering exceptions. for now having base classes is adequate and
 # in the future it might be necessary to refactor using like a BaseEvent
 # class to have a common interface for all pileline events to support
 # eventual queueing persistence for example, TBD.
-class LogStash::ShutdownEvent; end
-class LogStash::FlushEvent; end
-
 module LogStash
-  FLUSH = LogStash::FlushEvent.new
+  class SignalEvent
+    def flush?; raise "abstract method"; end;
+    def shutdown?; raise "abstract method"; end;
+  end
+
+  class ShutdownEvent < SignalEvent
+    def flush?; false; end;
+    def shutdown?; true; end;
+  end
+
+  class FlushEvent < SignalEvent
+    def flush?; true; end;
+    def shutdown?; false; end;
+  end
+
+  FLUSH = FlushEvent.new
 
   # LogStash::SHUTDOWN is used by plugins
-  SHUTDOWN = LogStash::ShutdownEvent.new
+  SHUTDOWN = ShutdownEvent.new
 end
 
 # for backward compatibility, require "logstash/event" is used a lots of places so let's bootstrap the

data/lib/logstash-core-event-java/version.rb

@@ -5,4 +5,4 @@
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.
 
-LOGSTASH_CORE_EVENT_JAVA_VERSION = "5.0.0.alpha6.snapshot1"
+LOGSTASH_CORE_EVENT_JAVA_VERSION = "5.0.0.alpha6.snapshot2"

data/spec/event_spec.rb

@@ -194,62 +194,27 @@ describe LogStash::Event do
   end
 
 
-  # noop logger used to test the injectable logger in Event
-  # this implementation is not complete because only the warn
-  # method is used in Event.
-  module DummyLogger
-    def self.warn(message)
-      # do nothing
-    end
-  end
+  # TODO(talevy): migrate tests to Java. no reason to test logging logic in ruby when it is being
+  #               done in java land.
 
-  context "logger" do
+  # context "logger" do
 
-    let(:logger) { double("Logger") }
-    after(:each) {  LogStash::Event.logger = LogStash::Event::DEFAULT_LOGGER }
+  #   let(:logger) { double("Logger") }
 
-    # the following 2 specs are using both a real module (DummyLogger)
-    # and a mock. both tests are needed to make sure the implementation
-    # supports both types of objects.
+  #   before(:each) do
+  #     allow(LogStash::Event).to receive(:logger).and_return(logger)
+  #   end
 
-    it "should set logger using a module" do
-      LogStash::Event.logger = DummyLogger
-      expect(DummyLogger).to receive(:warn).once
-      LogStash::Event.new(TIMESTAMP => "invalid timestamp")
-    end
+  #   it "should set logger using a module" do
+  #     expect(logger).to receive(:warn).once
+  #     LogStash::Event.new(TIMESTAMP => "invalid timestamp")
+  #   end
 
-    it "should set logger using a mock" do
-      LogStash::Event.logger = logger
-      expect(logger).to receive(:warn).once
-      LogStash::Event.new(TIMESTAMP => "invalid timestamp")
-    end
-
-    it "should unset logger" do
-      # first set
-      LogStash::Event.logger = logger
-      expect(logger).to receive(:warn).once
-      LogStash::Event.new(TIMESTAMP => "invalid timestamp")
-
-      # then unset
-      LogStash::Event.logger = LogStash::Event::DEFAULT_LOGGER
-      expect(logger).to receive(:warn).never
-      # this will produce a log line in stdout by the Java Event
-      LogStash::Event.new(TIMESTAMP => "ignore this log")
-    end
-
-
-    it "should warn on parsing error" do
-      LogStash::Event.logger = logger
-      expect(logger).to receive(:warn).once.with(/^Error parsing/)
-      LogStash::Event.new(TIMESTAMP => "invalid timestamp")
-    end
-
-    it "should warn on invalid timestamp object" do
-      LogStash::Event.logger = logger
-      expect(logger).to receive(:warn).once.with(/^Unrecognized/)
-      LogStash::Event.new(TIMESTAMP => Array.new)
-    end
-  end
+  #   it "should warn on invalid timestamp object" do
+  #     expect(logger).to receive(:warn).once.with(/^Unrecognized/)
+  #     LogStash::Event.new(TIMESTAMP => Array.new)
+  #   end
+  # end
 
   context "to_hash" do
     let (:source_hash) {  {"a" => 1, "b" => [1, 2, 3, {"h" => 1, "i" => "baz"}], "c" => {"d" => "foo", "e" => "bar", "f" => [4, 5, "six"]}} }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core-event-java
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha6.snapshot1
+  version: 5.0.0.alpha6.snapshot2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement