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

data/lib/logstash/output_delegator.rb

@@ -5,22 +5,24 @@ require "logstash/output_delegator_strategies/single"
 require "logstash/output_delegator_strategies/legacy"
 
 module LogStash class OutputDelegator
-  attr_reader :metric, :metric_events, :strategy, :namespaced_metric, :metric_events , :plugin_args, :strategy_registry
+  attr_reader :metric, :metric_events, :strategy, :namespaced_metric, :metric_events, :id
 
   def initialize(logger, output_class, metric, strategy_registry, plugin_args)
     @logger = logger
     @output_class = output_class
     @metric = metric
-    @plugin_args = plugin_args
-    @strategy_registry = strategy_registry
+    @id = plugin_args["id"]
+
     raise ArgumentError, "No strategy registry specified" unless strategy_registry
     raise ArgumentError, "No ID specified! Got args #{plugin_args}" unless id
     
-    build_strategy!
-
+    @strategy = strategy_registry.
+                  class_for(self.concurrency).
+                  new(@logger, @output_class, @metric, plugin_args)
+    
     @namespaced_metric = metric.namespace(id.to_sym)
+    @namespaced_metric.gauge(:name, config_name)
     @metric_events = @namespaced_metric.namespace(:events)
-    @namespaced_metric.gauge(:name, id)
   end
 
   def config_name
@@ -31,16 +33,6 @@ module LogStash class OutputDelegator
     @output_class.concurrency
   end
 
-  def build_strategy!
-    @strategy = strategy_registry.
-                  class_for(self.concurrency).
-                  new(@logger, @output_class, @metric, @plugin_args)
-  end
-
-  def id
-    @plugin_args["id"]
-  end
-
   def register
     @strategy.register
   end

data/lib/logstash/output_delegator_strategies/legacy.rb

@@ -4,7 +4,8 @@ module LogStash module OutputDelegatorStrategies class Legacy
   
   def initialize(logger, klass, metric, plugin_args)
     @worker_count = (plugin_args["workers"] || 1).to_i
-    @workers = @worker_count.times.map {|t| klass.new(plugin_args)}
+    @workers = @worker_count.times.map { klass.new(plugin_args) }
+    @workers.each {|w| w.metric = metric }
     @worker_queue = SizedQueue.new(@worker_count)
     @workers.each {|w| @worker_queue << w}
   end

data/lib/logstash/output_delegator_strategies/shared.rb

@@ -1,6 +1,7 @@
 module LogStash module OutputDelegatorStrategies class Shared
   def initialize(logger, klass, metric, plugin_args)
     @output = klass.new(plugin_args)
+    @output.metric = metric
   end
   
   def register

data/lib/logstash/output_delegator_strategies/single.rb

@@ -1,6 +1,7 @@
 module LogStash module OutputDelegatorStrategies class Single
   def initialize(logger, klass, metric, plugin_args)
     @output = klass.new(plugin_args)
+    @output.metric = metric
     @mutex = Mutex.new
   end
 

data/lib/logstash/outputs/base.rb

@@ -8,6 +8,7 @@ require "logstash/util/wrapped_synchronous_queue"
 require "concurrent/atomic/atomic_fixnum"
 
 class LogStash::Outputs::Base < LogStash::Plugin
+  include LogStash::Util::Loggable
   include LogStash::Config::Mixin
 
   config_name "output"
@@ -92,6 +93,10 @@ class LogStash::Outputs::Base < LogStash::Plugin
     end
   end
 
+  def workers_not_supported(message=nil)
+    raise "This plugin (#{self.class.name}) is using the obsolete '#workers_not_supported' method. If you installed this plugin specifically on this Logstash version, it is not compatible. If you are a plugin author, please see https://www.elastic.co/guide/en/logstash/current/_how_to_write_a_logstash_output_plugin.html for more info"
+  end
+
   def codec
     params["codec"]
   end

data/lib/logstash/patches/clamp.rb

@@ -16,9 +16,20 @@ module Clamp
 
   module Option
 
+    module Declaration
+      def deprecated_option(switches, type, description, opts = {})
+        Option::Definition.new(switches, type, description, opts).tap do |option|
+          declared_options << option
+          block ||= option.default_conversion_block
+          define_deprecated_accessors_for(option, opts, &block)
+        end
+      end
+    end
+
     module StrictDeclaration
 
       include Clamp::Attribute::Declaration
+      include LogStash::Util::Loggable
 
       # Instead of letting Clamp set up accessors for the options
       # weŕe going to tightly controlling them through
@@ -37,6 +48,16 @@ module Clamp
         end
       end
 
+      def define_deprecated_accessors_for(option, opts, &block)
+        define_deprecated_writer_for(option, opts, &block)
+      end
+
+      def define_deprecated_writer_for(option, opts, &block)
+        define_method(option.write_method) do |value|
+          self.class.logger.warn "DEPRECATION WARNING: The flag #{option.switches} has been deprecated, please use \"--#{opts[:new_flag]}=#{opts[:new_value]}\" instead."
+          LogStash::SETTINGS.set(opts[:new_flag], opts[:new_value])
+        end
+      end
     end
 
     class Definition

data/lib/logstash/pipeline.rb

@@ -20,6 +20,8 @@ require "logstash/output_delegator"
 require "logstash/filter_delegator"
 
 module LogStash; class Pipeline
+  include LogStash::Util::Loggable
+
   attr_reader :inputs,
     :filters,
     :outputs,
@@ -28,7 +30,6 @@ module LogStash; class Pipeline
     :events_filtered,
     :reporter,
     :pipeline_id,
-    :logger,
     :started_at,
     :thread,
     :config_str,
@@ -44,17 +45,16 @@ module LogStash; class Pipeline
     "LogStash::Inputs::Stdin"
   ]
 
-  def initialize(config_str, settings = LogStash::SETTINGS, namespaced_metric = nil)
+  def initialize(config_str, settings = SETTINGS, namespaced_metric = nil)
+    @logger = self.logger
     @config_str = config_str
     @config_hash = Digest::SHA1.hexdigest(@config_str)
     # Every time #plugin is invoked this is incremented to give each plugin
     # a unique id when auto-generating plugin ids
-    @plugin_counter ||= 0 
-    
-    @logger = Cabin::Channel.get(LogStash)
+    @plugin_counter ||= 0
     @settings = settings
     @pipeline_id = @settings.get_value("pipeline.id") || self.object_id
-    @reporter = LogStash::PipelineReporter.new(@logger, self)
+    @reporter = PipelineReporter.new(@logger, self)
 
     # A list of plugins indexed by id
     @plugins_by_id = {}
@@ -66,12 +66,12 @@ module LogStash; class Pipeline
 
     # This needs to be configured before we evaluate the code to make
     # sure the metric instance is correctly send to the plugins to make the namespace scoping work
-    @metric = namespaced_metric.nil? ? LogStash::Instrument::NullMetric.new : namespaced_metric
+    @metric = namespaced_metric.nil? ? Instrument::NullMetric.new : namespaced_metric
 
     grammar = LogStashConfigParser.new
     @config = grammar.parse(config_str)
     if @config.nil?
-      raise LogStash::ConfigurationError, grammar.failure_reason
+      raise ConfigurationError, grammar.failure_reason
     end
     # This will compile the config to ruby and evaluate the resulting code.
     # The code will initialize all the plugins and define the
@@ -82,8 +82,8 @@ module LogStash; class Pipeline
     # The config code is hard to represent as a log message...
     # So just print it.
 
-    if @settings.get_value("config.debug") && logger.debug?
-      logger.debug("Compiled pipeline code", :code => code)
+    if @settings.get_value("config.debug") && @logger.debug?
+      @logger.debug("Compiled pipeline code", :code => code)
     end
 
     begin
@@ -92,7 +92,7 @@ module LogStash; class Pipeline
       raise
     end
 
-    queue = LogStash::Util::WrappedSynchronousQueue.new
+    queue = Util::WrappedSynchronousQueue.new
     @input_queue_client = queue.write_client
     @filter_queue_client = queue.read_client
     # Note that @inflight_batches as a central mechanism for tracking inflight
@@ -148,11 +148,11 @@ module LogStash; class Pipeline
     @started_at = Time.now
 
     @thread = Thread.current
-    LogStash::Util.set_thread_name("[#{pipeline_id}]-pipeline-manager")
+    Util.set_thread_name("[#{pipeline_id}]-pipeline-manager")
 
     start_workers
 
-    @logger.log("Pipeline #{@pipeline_id} started")
+    @logger.info("Pipeline #{@pipeline_id} started")
 
     # Block until all inputs have stopped
     # Generally this happens if SIGINT is sent and `shutdown` is called from an external thread
@@ -167,7 +167,7 @@ module LogStash; class Pipeline
     shutdown_flusher
     shutdown_workers
 
-    @logger.log("Pipeline #{@pipeline_id} has been shutdown")
+    @logger.info("Pipeline #{@pipeline_id} has been shutdown")
 
     # exit code
     return 0
@@ -221,7 +221,7 @@ module LogStash; class Pipeline
 
       pipeline_workers.times do |t|
         @worker_threads << Thread.new do
-          LogStash::Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
+          Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
           worker_loop(batch_size, batch_delay)
         end
       end
@@ -256,7 +256,7 @@ module LogStash; class Pipeline
 
   def filter_batch(batch)
     batch.each do |event|
-      if event.is_a?(LogStash::Event)
+      if event.is_a?(Event)
         filtered = filter_func(event)
         filtered.each do |e|
           #these are both original and generated events
@@ -331,7 +331,7 @@ module LogStash; class Pipeline
   end
 
   def inputworker(plugin)
-    LogStash::Util::set_thread_name("[#{pipeline_id}]<#{plugin.class.config_name}")
+    Util::set_thread_name("[#{pipeline_id}]<#{plugin.class.config_name}")
     begin
       plugin.run(@input_queue_client)
     rescue => e
@@ -387,7 +387,7 @@ module LogStash; class Pipeline
     # Each worker thread will receive this exactly once!
     @worker_threads.each do |t|
       @logger.debug("Pushing shutdown", :thread => t.inspect)
-      @input_queue_client.push(LogStash::SHUTDOWN)
+      @input_queue_client.push(SHUTDOWN)
     end
 
     @worker_threads.each do |t|
@@ -411,20 +411,20 @@ module LogStash; class Pipeline
            args["id"]
          end
 
-    raise LogStash::ConfigurationError, "Two plugins have the id '#{id}', please fix this conflict" if @plugins_by_id[id]
+    raise ConfigurationError, "Two plugins have the id '#{id}', please fix this conflict" if @plugins_by_id[id]
     
     pipeline_scoped_metric = metric.namespace([:stats, :pipelines, pipeline_id.to_s.to_sym, :plugins])
 
-    klass = LogStash::Plugin.lookup(plugin_type, name)
+    klass = Plugin.lookup(plugin_type, name)
 
     # Scope plugins of type 'input' to 'inputs'
     type_scoped_metric = pipeline_scoped_metric.namespace("#{plugin_type}s".to_sym)
     plugin = if plugin_type == "output"
                OutputDelegator.new(@logger, klass, type_scoped_metric,
-                                   ::LogStash::OutputDelegatorStrategyRegistry.instance,
+                                   OutputDelegatorStrategyRegistry.instance,
                                    args)
              elsif plugin_type == "filter"
-               LogStash::FilterDelegator.new(@logger, klass, type_scoped_metric, args)
+               FilterDelegator.new(@logger, klass, type_scoped_metric, args)
              else # input
                input_plugin = klass.new(args)
                input_plugin.metric = type_scoped_metric.namespace(id)
@@ -472,7 +472,7 @@ module LogStash; class Pipeline
   def flush
     if @flushing.compare_and_set(false, true)
       @logger.debug? && @logger.debug("Pushing flush onto pipeline")
-      @input_queue_client.push(LogStash::FLUSH)
+      @input_queue_client.push(FLUSH)
     end
   end
 
@@ -506,7 +506,7 @@ module LogStash; class Pipeline
   def plugin_threads_info
     input_threads = @input_threads.select {|t| t.alive? }
     worker_threads = @worker_threads.select {|t| t.alive? }
-    (input_threads + worker_threads).map {|t| LogStash::Util.thread_info(t) }
+    (input_threads + worker_threads).map {|t| Util.thread_info(t) }
   end
 
   def stalling_threads_info

data/lib/logstash/pipeline_reporter.rb

@@ -101,7 +101,7 @@ module LogStash; class PipelineReporter
     pipeline.outputs.map do |output_delegator|
       {
         :type => output_delegator.config_name,
-        :plugin_args => output_delegator.plugin_args,
+        :id => output_delegator.id,
         :concurrency => output_delegator.concurrency,        
       }
     end

data/lib/logstash/plugin.rb

@@ -3,14 +3,13 @@ require "logstash/namespace"
 require "logstash/logging"
 require "logstash/config/mixin"
 require "logstash/instrument/null_metric"
-require "cabin"
 require "concurrent"
 require "securerandom"
 require "logstash/plugins/registry"
 
 class LogStash::Plugin
+  include LogStash::Util::Loggable
   attr_accessor :params
-  attr_accessor :logger
 
   NL = "\n"
 
@@ -45,12 +44,12 @@ class LogStash::Plugin
     self.class.name == other.class.name && @params == other.params
   end
 
-  def initialize(params=nil)    
+  def initialize(params=nil)
+    @logger = self.logger
     @params = LogStash::Util.deep_clone(params)
     # The id should always be defined normally, but in tests that might not be the case
     # In the future we may make this more strict in the Plugin API
     @params["id"] ||= "#{self.class.config_name}_#{SecureRandom.uuid}"
-    @logger = Cabin::Channel.get(LogStash)
   end
 
   # Return a uniq ID for this plugin configuration, by default
@@ -161,10 +160,4 @@ class LogStash::Plugin
   def self.is_a_plugin?(klass, name)
     klass.ancestors.include?(LogStash::Plugin) && klass.respond_to?(:config_name) && klass.config_name == name
   end
-
-  # @return [Cabin::Channel] logger channel for class methods
-  def self.logger
-    @logger ||= Cabin::Channel.get(LogStash)
-  end
-
 end # class LogStash::Plugin

data/lib/logstash/plugins/registry.rb

@@ -1,9 +1,11 @@
 # encoding: utf-8
 require 'singleton'
 require "rubygems/package"
+require "logstash/util/loggable"
 
 module LogStash
   class Registry
+    include LogStash::Util::Loggable
 
     ##
     # Placeholder class for registered plugins
@@ -45,7 +47,7 @@ module LogStash
 
     def initialize
       @registry = {}
-      @logger = Cabin::Channel.get(LogStash)
+      @logger = self.logger
     end
 
     def lookup(type, plugin_name, &block)

data/lib/logstash/runner.rb

@@ -4,7 +4,6 @@ Encoding.default_external = Encoding::UTF_8
 $DEBUGLIST = (ENV["DEBUG"] || "").split(",")
 
 require "clamp"
-require "cabin"
 require "net/http"
 require "logstash/environment"
 
@@ -19,9 +18,10 @@ require "logstash/settings"
 require "logstash/version"
 
 class LogStash::Runner < Clamp::StrictCommand
+  include LogStash::Util::Loggable
   # The `path.settings` need to be defined in the runner instead of the `logstash-core/lib/logstash/environment.rb`
   # because the `Environment::LOGSTASH_HOME` doesn't exist in the context of the `logstash-core` gem.
-  # 
+  #
   # See issue https://github.com/elastic/logstash/issues/5361
   LogStash::SETTINGS.register(LogStash::Setting::String.new("path.settings", ::File.join(LogStash::Environment::LOGSTASH_HOME, "config")))
 
@@ -82,7 +82,8 @@ class LogStash::Runner < Clamp::StrictCommand
     :attribute_name => "path.log"
 
   option "--log.level", "LEVEL", I18n.t("logstash.runner.flag.log_level"),
-    :default => LogStash::SETTINGS.get_default("log.level")
+    :default => LogStash::SETTINGS.get_default("log.level"),
+    :attribute_name => "log.level"
 
   option "--config.debug", :flag,
     I18n.t("logstash.runner.flag.config_debug"),
@@ -132,10 +133,22 @@ class LogStash::Runner < Clamp::StrictCommand
     :attribute_name => "path.settings",
     :default => LogStash::SETTINGS.get_default("path.settings")
 
+  ### DEPRECATED FLAGS ###
+  deprecated_option ["--verbose"], :flag,
+    I18n.t("logstash.runner.flag.verbose"),
+    :new_flag => "log.level", :new_value => "info"
+
+  deprecated_option ["--debug"], :flag,
+    I18n.t("logstash.runner.flag.debug"),
+    :new_flag => "log.level", :new_value => "debug"
+
+  deprecated_option ["--quiet"], :flag,
+    I18n.t("logstash.runner.flag.quiet"),
+    :new_flag => "log.level", :new_value => "error"
+
   attr_reader :agent
 
   def initialize(*args)
-    @logger = Cabin::Channel.get(LogStash)
     @settings = LogStash::SETTINGS
     super(*args)
   end
@@ -150,13 +163,20 @@ class LogStash::Runner < Clamp::StrictCommand
     rescue => e
       # abort unless we're just looking for the help
       if (["--help", "-h"] & args).empty?
-        @logger.subscribe(STDOUT)
-        @logger.warn("Logstash has a new settings file which defines start up time settings. This file is typically located in $LS_HOME/config or /etc/logstash. If you installed Logstash through a package and are starting it manually please specify the location to this settings file by passing in \"--path.settings=/path/..\" in the command line options")
-        @logger.fatal("Failed to load settings file from \"path.settings\". Aborting...", "path.settings" => LogStash::SETTINGS.get("path.settings"), "exception" => e.class, "message" => e.message)
+        $stderr.puts "INFO: Logstash has a new settings file which defines start up time settings. This file is typically located in $LS_HOME/config or /etc/logstash. If you installed Logstash through a package and are starting it manually please specify the location to this settings file by passing in \"--path.settings=/path/..\" in the command line options"
+        $stderr.puts "ERROR: Failed to load settings file from \"path.settings\". Aborting... path.setting=#{LogStash::SETTINGS.get("path.settings")}, exception=#{e.class}, message=>#{e.message}"
         return 1
       end
     end
 
+    # Configure Logstash logging facility, this need to be done before everything else to
+    # make sure the logger has the correct settings and the log level is correctly defined.
+    # TODO(talevy): cleanly support `path.logs` setting in log4j
+    unless java.lang.System.getProperty("log4j.configurationFile")
+      log4j_config_location = setting("path.settings") + "/log4j2.properties"
+      LogStash::Logging::Logger::initialize(log4j_config_location)
+    end
+
     super(*[args])
   end
 
@@ -164,12 +184,12 @@ class LogStash::Runner < Clamp::StrictCommand
     require "logstash/util"
     require "logstash/util/java_version"
     require "stud/task"
-    require "cabin" # gem 'cabin'
-    require "logstash/logging/json"
 
-    # Configure Logstash logging facility, this need to be done before everything else to
-    # make sure the logger has the correct settings and the log level is correctly defined.
-    configure_logging(setting("path.log"), setting("log.level"))
+    LogStash::Logging::Logger::configure_logging(setting("log.level"))
+
+    if setting("config.debug") && logger.debug?
+      logger.warn("--config.debug was specified, but log.level was not set to \'debug\'! No config info will be logged.")
+    end
 
     LogStash::Util::set_thread_name(self.class.name)
 
@@ -186,7 +206,6 @@ class LogStash::Runner < Clamp::StrictCommand
     end
 
     LogStash::ShutdownWatcher.unsafe_shutdown = setting("pipeline.unsafe_shutdown")
-    LogStash::ShutdownWatcher.logger = @logger
 
     configure_plugin_paths(setting("path.plugins"))
 
@@ -197,7 +216,7 @@ class LogStash::Runner < Clamp::StrictCommand
 
     return start_shell(setting("interactive"), binding) if setting("interactive")
 
-    @settings.format_settings.each {|line| @logger.info(line) }
+    @settings.format_settings.each {|line| logger.info(line) }
 
     if setting("config.string").nil? && setting("path.config").nil?
       fail(I18n.t("logstash.runner.missing-configuration"))
@@ -209,14 +228,14 @@ class LogStash::Runner < Clamp::StrictCommand
     end
 
     if setting("config.test_and_exit")
-      config_loader = LogStash::Config::Loader.new(@logger)
+      config_loader = LogStash::Config::Loader.new(logger)
       config_str = config_loader.format_config(setting("path.config"), setting("config.string"))
       begin
         LogStash::Pipeline.new(config_str)
-        @logger.terminal "Configuration OK"
+        puts "Configuration OK"
         return 0
       rescue => e
-        @logger.fatal I18n.t("logstash.runner.invalid-configuration", :error => e.message)
+        logger.fatal I18n.t("logstash.runner.invalid-configuration", :error => e.message)
         return 1
       end
     end
@@ -239,6 +258,9 @@ class LogStash::Runner < Clamp::StrictCommand
 
     @agent.shutdown
 
+    # flush any outstanding log messages during shutdown
+    org.apache.logging.log4j.LogManager.shutdown
+
     agent_return
 
   rescue Clamp::UsageError => e
@@ -246,7 +268,7 @@ class LogStash::Runner < Clamp::StrictCommand
     show_short_help
     return 1
   rescue => e
-    @logger.fatal(I18n.t("oops"), :error => e, :backtrace => e.backtrace)
+    logger.fatal(I18n.t("oops"), :error => e, :backtrace => e.backtrace)
     return 1
   ensure
     Stud::untrap("INT", sigint_id) unless sigint_id.nil?
@@ -258,10 +280,10 @@ class LogStash::Runner < Clamp::StrictCommand
   def show_version
     show_version_logstash
 
-    if @logger.debug? || @logger.info?
+    if logger.is_info_enabled
       show_version_ruby
       show_version_java if LogStash::Environment.jruby?
-      show_gems if @logger.debug?
+      show_gems if logger.debug?
     end
   end # def show_version
 
@@ -299,55 +321,6 @@ class LogStash::Runner < Clamp::StrictCommand
     LogStash::Agent.new(*args)
   end
 
-  # Point logging at a specific path.
-  def configure_logging(path, level)
-    @logger = Cabin::Channel.get(LogStash)
-    # Set with the -v (or -vv...) flag
-    case level
-    when "quiet"
-      @logger.level = :error
-    when "verbose"
-      @logger.level = :info
-    when "debug"
-      @logger.level = :debug
-    else
-      @logger.level = :warn
-    end
-
-    if path
-      # TODO(sissel): Implement file output/rotation in Cabin.
-      # TODO(sissel): Catch exceptions, report sane errors.
-      begin
-        @log_fd.close if @log_fd
-        @log_fd = File.new(path, "a")
-      rescue => e
-        fail(I18n.t("logstash.runner.configuration.log_file_failed",
-                    :path => path, :error => e))
-      end
-
-      if setting("log.format") == "json"
-        @logger.subscribe(LogStash::Logging::JSON.new(STDOUT), :level => :fatal)
-        @logger.subscribe(LogStash::Logging::JSON.new(@log_fd))
-      else
-        @logger.subscribe(STDOUT, :level => :fatal)
-        @logger.subscribe(@log_fd)
-      end
-      @logger.terminal "Sending logstash logs to #{path}."
-    else
-      if setting("log.format") == "json"
-        @logger.subscribe(LogStash::Logging::JSON.new(STDOUT))
-      else
-        @logger.subscribe(STDOUT)
-      end
-    end
-
-    if setting("config.debug") && @logger.level != :debug
-      @logger.warn("--config.debug was specified, but log.level was not set to \'debug\'! No config info will be logged.")
-    end
-
-    # TODO(sissel): redirect stdout/stderr to the log as well
-    # http://jira.codehaus.org/browse/JRUBY-7003
-  end # def configure_logging
 
   # Emit a failure message and abort.
   def fail(message)
@@ -376,14 +349,14 @@ class LogStash::Runner < Clamp::StrictCommand
 
   def trap_sighup
     Stud::trap("HUP") do
-      @logger.warn(I18n.t("logstash.agent.sighup"))
+      logger.warn(I18n.t("logstash.agent.sighup"))
       @agent.reload_state!
     end
   end
 
   def trap_sigterm
     Stud::trap("TERM") do
-      @logger.warn(I18n.t("logstash.agent.sigterm"))
+      logger.warn(I18n.t("logstash.agent.sigterm"))
       @agent_task.stop!
     end
   end
@@ -391,11 +364,11 @@ class LogStash::Runner < Clamp::StrictCommand
   def trap_sigint
     Stud::trap("INT") do
       if @interrupted_once
-        @logger.fatal(I18n.t("logstash.agent.forced_sigint"))
+        logger.fatal(I18n.t("logstash.agent.forced_sigint"))
         exit
       else
-        @logger.warn(I18n.t("logstash.agent.sigint"))
-        Thread.new(@logger) {|logger| sleep 5; logger.warn(I18n.t("logstash.agent.slow_shutdown")) }
+        logger.warn(I18n.t("logstash.agent.sigint"))
+        Thread.new(logger) {|lg| sleep 5; lg.warn(I18n.t("logstash.agent.slow_shutdown")) }
         @interrupted_once = true
         @agent_task.stop!
       end