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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e89e8c25486877ae001285428c6e6d9fbe3dfc6b
-  data.tar.gz: 5e6318f6ae9f263864588fa2361f5e9ebdc94fb4
+  metadata.gz: 64e38afe34f986adc6451f62d9adb961977eb5d3
+  data.tar.gz: a78880a388cbae77c13de3a11bfd8789dad96898
 SHA512:
-  metadata.gz: af57be94f22a74d3ffbbde98eca0eb92fa503c15254b666c5fdfe518c401af10260203b520b9ce26f2b9043c93fdd2289f2af5ecb1387deaf7f65bdfa6ad1a19
-  data.tar.gz: 9d6a1a9a69f77fb49cb0ec3f5d2be1f8a0f2f3a460590a4722ae071cd711fb5a792baa663c233a0f06b94dbea6e7a09a3fd9c0f60ee0ac7d488097b5a96f2a52
+  metadata.gz: 1bac0882c5f848de4d0c7c3d9c115efabd49ad102d37cf652b294927c66c540ce37361ba8ef259e9080d93d6728f63781b266ebd9482552a9a6f5984fbdc8bb4
+  data.tar.gz: f1d4e71fefb6775e6a09523fc2ca0f1ead2e294c2c7eed06c748bd06360eacd2518ff459c422138d7c372fe8b42e9e5d52b148aefa0443aa6a231be925a7686f

data/lib/jars.rb

@@ -0,0 +1,7 @@
+require 'jar_dependencies'
+require_jar('org.apache.logging.log4j', 'log4j-1.2-api', '2.6.2')
+require_jar('org.apache.logging.log4j', 'log4j-api', '2.6.2')
+require_jar('org.apache.logging.log4j', 'log4j-core', '2.6.2')
+require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.7.4')
+require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.7.4')
+require_jar('org.logstash', 'logstash-core', '5.0.0-alpha6')

data/lib/logstash-core/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_VERSION = "5.0.0.alpha6.snapshot1"
+LOGSTASH_CORE_VERSION = "5.0.0.alpha6.snapshot2"

data/lib/logstash/agent.rb

@@ -18,6 +18,7 @@ require "securerandom"
 LogStash::Environment.load_locale!
 
 class LogStash::Agent
+  include LogStash::Util::Loggable
   STARTED_AT = Time.now.freeze
 
   attr_reader :metric, :node_name, :pipelines, :settings, :webserver
@@ -28,10 +29,9 @@ class LogStash::Agent
   #   :node_name [String] - identifier for the agent
   #   :auto_reload [Boolean] - enable reloading of pipelines
   #   :reload_interval [Integer] - reload pipelines every X seconds
-  #   :logger [Cabin::Channel] - logger instance
   def initialize(settings = LogStash::SETTINGS)
+    @logger = self.class.logger
     @settings = settings
-    @logger = Cabin::Channel.get(LogStash)
     @auto_reload = setting("config.reload.automatic")
 
     @pipelines = {}

data/lib/logstash/api/rack_app.rb

@@ -10,18 +10,17 @@ require "logstash/api/modules/stats"
 module LogStash
   module Api
     module RackApp
-      # Cabin is not compatible with CommonLogger, and this gives us more control anyway
       METADATA_FIELDS = [:request_method, :path_info, :query_string, :http_version, :http_accept].freeze
       def self.log_metadata(status, env)
         METADATA_FIELDS.reduce({:status => status}) do |acc, field|
           acc[field] = env[field.to_s.upcase]
           acc
-        end        
+        end
       end
-      
+
       class ApiLogger
         LOG_MESSAGE = "API HTTP Request".freeze
-        
+
         def initialize(app, logger)
           @app = app
           @logger = logger
@@ -30,24 +29,24 @@ module LogStash
         def call(env)
           res = @app.call(env)
           status, headers, body = res
-          
+
           if fatal_error?(status)
-            @logger.warn? && @logger.warn(LOG_MESSAGE, RackApp.log_metadata(status, env))                      
-          else          
-            @logger.info? && @logger.info(LOG_MESSAGE, RackApp.log_metadata(status, env))                      
+            @logger.warn? && @logger.warn(LOG_MESSAGE, RackApp.log_metadata(status, env))
+          else
+            @logger.info? && @logger.info(LOG_MESSAGE, RackApp.log_metadata(status, env))
           end
 
-          res          
+          res
         end
 
         def fatal_error?(status)
           status >= 500 && status < 600
         end
       end
-      
+
       class ApiErrorHandler
         LOG_MESSAGE = "Internal API server error".freeze
-        
+
         def initialize(app, logger)
           @app = app
           @logger = logger
@@ -65,21 +64,21 @@ module LogStash
                          })
 
           @logger.error(LOG_MESSAGE, body)
-          
+
           [500,
            {'Content-Type' => 'application/json'},
            [LogStash::Json.dump(body)]
           ]
         end
       end
-      
+
       def self.app(logger, agent, environment)
         namespaces = rack_namespaces(agent)
 
         Rack::Builder.new do
           # Custom logger object. Rack CommonLogger does not work with cabin
           use ApiLogger, logger
-          
+
           # In test env we want errors to propogate up the chain
           # so we get easy to understand test failures.
           # In production / dev we don't want a bad API endpoint
@@ -87,7 +86,7 @@ module LogStash
           if environment != "test"
             use ApiErrorHandler, logger
           end
-          
+
           run LogStash::Api::Modules::Root.new(nil, agent)
           namespaces.each_pair do |namespace, app|
             map(namespace) do

data/lib/logstash/config/config_ast.rb

@@ -123,7 +123,7 @@ module LogStash; module Config; module AST
         definitions << "define_singleton_method :#{type}_func do |event|"
         definitions << "  targeted_outputs = []" if type == "output"
         definitions << "  events = [event]" if type == "filter"
-        definitions << "  @logger.debug? && @logger.debug(\"#{type} received\", :event => event.to_hash)"
+        definitions << "  @logger.debug? && @logger.debug(\"#{type} received\", \"event\" => event.to_hash)"
 
         sections.select { |s| s.plugin_type.text_value == type }.each do |s|
           definitions << s.compile.split("\n", -1).map { |e| "  #{e}" }
@@ -174,7 +174,7 @@ module LogStash; module Config; module AST
 
               return if events.nil? || events.empty?
 
-              @logger.debug? && @logger.debug(\"Flushing\", :plugin => @generated_objects[:#{name}], :events => events)
+              @logger.debug? && @logger.debug(\"Flushing\", :plugin => @generated_objects[:#{name}], :events => events.map { |x| x.to_hash  })
 
               #{plugin.compile_starting_here.gsub(/^/, "  ")}
 

data/lib/logstash/config/file.rb

@@ -8,11 +8,10 @@ require "logger"
 
 class LogStash::Config::File
   include Enumerable
-  attr_accessor :logger
+  include LogStash::Util::Loggable
 
   public
   def initialize(text)
-    @logger = Cabin::Channel.get(LogStash)
     @text = text
     @config = parse(text)
   end # def initialize

data/lib/logstash/config/mixin.rb

@@ -66,7 +66,7 @@ module LogStash::Config::Mixin
       if opts && opts[:deprecated]
         extra = opts[:deprecated].is_a?(String) ? opts[:deprecated] : ""
         extra.gsub!("%PLUGIN%", self.class.config_name)
-        @logger.warn("You are using a deprecated config setting " +
+        self.logger.warn("You are using a deprecated config setting " +
                      "#{name.inspect} set in #{self.class.config_name}. " +
                      "Deprecated settings will continue to work, " +
                      "but are scheduled for removal from logstash " +
@@ -141,7 +141,7 @@ module LogStash::Config::Mixin
       next if key[0, 1] == "@"
 
       # Set this key as an instance variable only if it doesn't start with an '@'
-      @logger.debug("config #{self.class.name}/@#{key} = #{value.inspect}")
+      self.logger.debug("config #{self.class.name}/@#{key} = #{value.inspect}")
       instance_variable_set("@#{key}", value)
     end
 
@@ -198,8 +198,7 @@ module LogStash::Config::Mixin
     # Deprecated: Declare the version of the plugin
     # inside the gemspec.
     def milestone(m = nil)
-      @logger = Cabin::Channel.get(LogStash)
-      @logger.debug(I18n.t('logstash.plugin.deprecated_milestone', :plugin => config_name))
+      self.logger.debug(I18n.t('logstash.plugin.deprecated_milestone', :plugin => config_name))
     end
 
     # Define a new configuration setting
@@ -262,7 +261,6 @@ module LogStash::Config::Mixin
     def validate(params)
       @plugin_name = config_name
       @plugin_type = ancestors.find { |a| a.name =~ /::Base$/ }.config_name
-      @logger = Cabin::Channel.get(LogStash)
       is_valid = true
 
       print_version_notice
@@ -282,12 +280,12 @@ module LogStash::Config::Mixin
 
         if plugin_version < PLUGIN_VERSION_1_0_0
           if plugin_version < PLUGIN_VERSION_0_9_0
-            @logger.info(I18n.t("logstash.plugin.version.0-1-x", 
+            self.logger.info(I18n.t("logstash.plugin.version.0-1-x",
                                 :type => @plugin_type,
                                 :name => @config_name,
                                 :LOGSTASH_VERSION => LOGSTASH_VERSION))
           else
-            @logger.info(I18n.t("logstash.plugin.version.0-9-x", 
+            self.logger.info(I18n.t("logstash.plugin.version.0-9-x",
                                 :type => @plugin_type,
                                 :name => @config_name,
                                 :LOGSTASH_VERSION => LOGSTASH_VERSION))
@@ -297,7 +295,7 @@ module LogStash::Config::Mixin
         # If we cannot find a version in the currently installed gems we
         # will display this message. This could happen in the test, if you 
         # create an anonymous class to test a plugin.
-        @logger.warn(I18n.t("logstash.plugin.no_version",
+        self.logger.warn(I18n.t("logstash.plugin.no_version",
                                 :type => @plugin_type,
                                 :name => @config_name,
                                 :LOGSTASH_VERSION => LOGSTASH_VERSION))
@@ -321,7 +319,7 @@ module LogStash::Config::Mixin
 
       if invalid_params.size > 0
         invalid_params.each do |name|
-          @logger.error("Unknown setting '#{name}' for #{@plugin_name}")
+          self.logger.error("Unknown setting '#{name}' for #{@plugin_name}")
         end
         return false
       end # if invalid_params.size > 0
@@ -348,7 +346,7 @@ module LogStash::Config::Mixin
 
         value = params[config_key]
         if value.nil? || (config[:list] && Array(value).empty?)
-          @logger.error(I18n.t("logstash.runner.configuration.setting_missing",
+          self.logger.error(I18n.t("logstash.runner.configuration.setting_missing",
                                :setting => config_key, :plugin => @plugin_name,
                                :type => @plugin_type))
           is_valid = false
@@ -396,7 +394,7 @@ module LogStash::Config::Mixin
             # Used for converting values in the config to proper objects.
             params[key] = processed_value
           else
-            @logger.error(I18n.t("logstash.runner.configuration.setting_invalid",
+            self.logger.error(I18n.t("logstash.runner.configuration.setting_invalid",
                                  :plugin => @plugin_name, :type => @plugin_type,
                                  :setting => key, :value => value.inspect,
                                  :value_type => config_settings[:validate],

data/lib/logstash/environment.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "logstash/errors"
+require "logstash/java_integration"
 require "logstash/config/cpu_core_strategy"
 require "logstash/settings"
 require "socket"
@@ -32,7 +33,7 @@ module LogStash
                     Setting.new("path.plugins", Array, []),
             Setting::String.new("interactive", nil, false),
            Setting::Boolean.new("config.debug", false),
-            Setting::String.new("log.level", "warn", true, ["quiet", "verbose", "warn", "debug"]),
+            Setting::String.new("log.level", "warn", true, ["fatal", "error", "warn", "debug", "info", "trace"]),
            Setting::Boolean.new("version", false),
            Setting::Boolean.new("help", false),
             Setting::String.new("path.log", nil, false),

data/lib/logstash/filters/base.rb

@@ -7,6 +7,7 @@ require "logstash/config/mixin"
 require "logstash/util/decorators"
 
 class LogStash::Filters::Base < LogStash::Plugin
+  include LogStash::Util::Loggable
   include LogStash::Config::Mixin
 
   config_name "filter"

data/lib/logstash/inputs/base.rb

@@ -9,6 +9,7 @@ require "logstash/util/decorators"
 
 # This is the base class for Logstash inputs.
 class LogStash::Inputs::Base < LogStash::Plugin
+  include LogStash::Util::Loggable
   include LogStash::Config::Mixin
 
   config_name "input"

data/lib/logstash/java_integration.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "java"
+require "jars"
 
 # this is mainly for usage with JrJackson json parsing in :raw mode which genenerates
 # Java::JavaUtil::ArrayList and Java::JavaUtil::LinkedHashMap native objects for speed.

data/lib/logstash/logging.rb

@@ -1,91 +1,3 @@
 # encoding: utf-8
+require "logstash/logging/logger"
 require "logstash/namespace"
-require "cabin"
-require "logger"
-
-class LogStash::Logger
-  attr_accessor :target
-
-  public
-  def initialize(*args)
-    super()
-
-    #self[:program] = File.basename($0)
-    #subscribe(::Logger.new(*args))
-    @target = args[0]
-    @channel = Cabin::Channel.get(LogStash)
-
-    # lame hack until cabin's smart enough not to doubley-subscribe something.
-    # without this subscription count check, running the test suite
-    # causes Cabin to subscribe to STDOUT maaaaaany times.
-    subscriptions = @channel.instance_eval { @subscribers.count }
-    @channel.subscribe(@target) unless subscriptions > 0
-
-    # Set default loglevel to WARN unless $DEBUG is set (run with 'ruby -d')
-    @level = $DEBUG ? :debug : :warn
-    if ENV["LOGSTASH_DEBUG"]
-      @level = :debug
-    end
-
-    # Direct metrics elsewhere.
-    @channel.metrics.channel = Cabin::Channel.new
-  end # def initialize
-
-  # Delegation
-  def level=(value) @channel.level = value; end
-  def debug(*args); @channel.debug(*args); end
-  def debug?(*args); @channel.debug?(*args); end
-  def info(*args); @channel.info(*args); end
-  def info?(*args); @channel.info?(*args); end
-  def warn(*args); @channel.warn(*args); end
-  def warn?(*args); @channel.warn?(*args); end
-  def error(*args); @channel.error(*args); end
-  def error?(*args); @channel.error?(*args); end
-  def fatal(*args); @channel.fatal(*args); end
-  def fatal?(*args); @channel.fatal?(*args); end
-
-  def self.setup_log4j(logger)
-    require "java"
-
-    properties = java.util.Properties.new
-    log4j_level = "WARN"
-    case logger.level
-      when :debug
-        log4j_level = "DEBUG"
-      when :info
-        log4j_level = "INFO"
-      when :warn
-        log4j_level = "WARN"
-    end # case level
-    properties.setProperty("log4j.rootLogger", "#{log4j_level},logstash")
-
-    # TODO(sissel): This is a shitty hack to work around the fact that
-    # LogStash::Logger isn't used anymore. We should fix that.
-    target = logger.instance_eval { @subscribers }.values.first.instance_eval { @io }
-    case target
-      when STDOUT
-        properties.setProperty("log4j.appender.logstash",
-                      "org.apache.log4j.ConsoleAppender")
-        properties.setProperty("log4j.appender.logstash.Target", "System.out")
-      when STDERR
-        properties.setProperty("log4j.appender.logstash",
-                      "org.apache.log4j.ConsoleAppender")
-        properties.setProperty("log4j.appender.logstash.Target", "System.err")
-      when target.is_a?(File)
-        properties.setProperty("log4j.appender.logstash",
-                      "org.apache.log4j.FileAppender")
-        properties.setProperty("log4j.appender.logstash.File", target.path)
-      else
-        properties.setProperty("log4j.appender.logstash", "org.apache.log4j.varia.NullAppender")
-    end # case target
-
-    properties.setProperty("log4j.appender.logstash.layout",
-                  "org.apache.log4j.PatternLayout")
-    properties.setProperty("log4j.appender.logstash.layout.conversionPattern",
-                  "log4j, [%d{yyyy-MM-dd}T%d{HH:mm:ss.SSS}] %5p: %c: %m%n")
-
-    org.apache.log4j.LogManager.resetConfiguration
-    org.apache.log4j.PropertyConfigurator.configure(properties)
-    logger.debug("log4j java properties setup", :log4j_level => log4j_level)
-  end
-end # class LogStash::Logger

data/lib/logstash/logging/json.rb

@@ -3,7 +3,7 @@ require "logstash/namespace"
 require "logstash/logging"
 require "logstash/json"
 
-module LogStash; class Logging; class JSON
+module LogStash; module Logging; class JSON
   def initialize(io)
     raise ArgumentError, "Expected IO, got #{io.class.name}" unless io.is_a?(IO)
 

data/lib/logstash/logging/logger.rb

@@ -0,0 +1,72 @@
+require "logstash/java_integration"
+
+module LogStash
+  module Logging
+    class Logger
+      java_import org.apache.logging.log4j.Level
+      java_import org.apache.logging.log4j.LogManager
+      java_import org.apache.logging.log4j.core.config.Configurator
+
+      def initialize(name)
+        @logger = LogManager.getLogger(name)
+      end
+
+      def debug?
+        @logger.is_debug_enabled
+      end
+
+      def info?
+        @logger.is_info_enabled
+      end
+
+      def error?
+        @logger.is_error_enabled
+      end
+
+      def warn?
+        @logger.is_warn_enabled
+      end
+
+      def fatal?
+        @logger.is_fatal_enabled
+      end
+
+      def trace?
+        @logger.is_trace_enabled
+      end
+
+      def debug(message, data = {})
+        @logger.debug(message, data)
+      end
+
+      def warn(message, data = {})
+        @logger.warn(message, data)
+      end
+
+      def info(message, data = {})
+        @logger.info(message, data)
+      end
+
+      def error(message, data = {})
+        @logger.error(message, data)
+      end
+
+      def fatal(message, data = {})
+        @logger.fatal(message, data)
+      end
+
+      def trace(message, data = {})
+        @logger.trace(message, data)
+      end
+
+      # Point logging at a specific path.
+      def self.configure_logging(level, path = LogManager::ROOT_LOGGER_NAME)
+        Configurator.setLevel(path, Level.toLevel(level))
+      end # def configure_logging
+
+      def self.initialize(config_location)
+        Configurator.initialize(nil, config_location)
+      end
+    end
+  end
+end