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

merge feature/java_persistence into 5.x

Browse source
This commit is contained in:
Colin Surprenant 2016-10-31 17:03:40 -04:00
parent d7d2b04156
commit ab05082a89
101 changed files with 5999 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

6
logstash-core-event-java/lib/logstash-core-event-java_jars.rb
View file

@ -3,12 +3,18 @@ begin
require 'jar_dependencies'
rescue LoadError
require 'com/fasterxml/jackson/core/jackson-databind/2.7.3/jackson-databind-2.7.3.jar'
require 'org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar'
require 'com/fasterxml/jackson/core/jackson-annotations/2.7.0/jackson-annotations-2.7.0.jar'
require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.7.3/jackson-module-afterburner-2.7.3.jar'
require 'com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.7.3/jackson-dataformat-cbor-2.7.3.jar'
require 'com/fasterxml/jackson/core/jackson-core/2.7.3/jackson-core-2.7.3.jar'
end
if defined? Jars
require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.7.3' )
require_jar( 'org.apache.logging.log4j', 'log4j-api', '2.6.2' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.7.0' )
require_jar( 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.7.3' )
require_jar( 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.7.3' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.7.3' )
end

8
logstash-core-event-java/lib/logstash/event.rb
View file

@ -25,10 +25,14 @@ module LogStash
def shutdown?; false; end;
end
FLUSH = FlushEvent.new
class NoSignal < SignalEvent
def flush?; false; end;
def shutdown?; false; end;
end
# LogStash::SHUTDOWN is used by plugins
FLUSH = FlushEvent.new
SHUTDOWN = ShutdownEvent.new
NO_SIGNAL = NoSignal.new
class Event
MSG_BRACKETS_METHOD_MISSING = "Direct event field references (i.e. event['field']) have been disabled in favor of using event get and set methods (e.g. event.get('field')). Please consult the Logstash 5.0 breaking changes documentation for more details.".freeze