Rename config variables

Author: Juuso Mäyränen

docs/index.asciidoc

@@ -127,8 +127,18 @@ The unix socket path of your Redis server.
 
 The name of a Redis list or channel.
 
-[id="plugins-{type}s-{plugin}-max_items_per_worker"]
-===== `max_items_per_worker`
+
+[id="plugins-{type}s-{plugin}-password"]
+===== `password`
+
+  * Value type is <<password,password>>
+  * There is no default value for this setting.
+
+Password to authenticate with. There is no authentication by default.
+
+
+[id="plugins-{type}s-{plugin}-pattern_list_max_items"]
+===== `pattern_list_max_items`
 
   * Value type is <<number,number>>
   * Default value is `1000`
@@ -138,13 +148,24 @@ After the list is empty or this number of items have been processed, the thread
 new one will be started if there are non-empty lists matching the pattern without a consumer.
 
 
-[id="plugins-{type}s-{plugin}-password"]
-===== `password`
+[id="plugins-{type}s-{plugin}-pattern_list_threadpool_sleep"]
+===== `pattern_list_threadpool_sleep`
 
-  * Value type is <<password,password>>
-  * There is no default value for this setting.
+  * Value type is <<number,number>>
+  * Default value is `0.2`
+
+Time to sleep in main loop after checking if more threads can/need to be spawned.
+Applies to `data_type` is `pattern_list`
+
+
+[id="plugins-{type}s-{plugin}-pattern_list_threads"]
+===== `pattern_list_threads`
+
+  * Value type is <<number,number>>
+  * Default value is `20`
+
+Maximum number of worker threads to spawn when using `data_type` `pattern_list`.
 
-Password to authenticate with. There is no authentication by default.
 
 [id="plugins-{type}s-{plugin}-port"]
 ===== `port`
@@ -154,6 +175,7 @@ Password to authenticate with. There is no authentication by default.
 
 The port to connect on.
 
+
 [id="plugins-{type}s-{plugin}-ssl"]
 ===== `ssl`
 
@@ -163,16 +185,6 @@ The port to connect on.
 Enable SSL support.
 
 
-[id="plugins-{type}s-{plugin}-threadpool_queue_sleep"]
-===== `threadpool_queue_sleep`
-
-  * Value type is <<number,number>>
-  * Default value is `0.2`
-
-Time to sleep in main loop after checking if more threads can/need to be spawned.
-Applies to `data_type` is `pattern_list`
-
-
 [id="plugins-{type}s-{plugin}-threads"]
 ===== `threads`
 
@@ -189,14 +201,6 @@ Applies to `data_type` is `pattern_list`
 Initial connection timeout in seconds.
 
 
-[id="plugins-{type}s-{plugin}-worker_thread_count"]
-===== `worker_thread_count`
-
-  * Value type is <<number,number>>
-  * Default value is `20`
-
-Maximum number of worker threads to spawn when using `data_type` `pattern_list`.
-
 
 [id="plugins-{type}s-{plugin}-common-options"]
 include::{include_path}/{type}.asciidoc[]

lib/logstash/inputs/redis.rb

@@ -65,16 +65,16 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
   config :command_map, :validate => :hash, :default => {}
 
   # Maximum number of worker threads to spawn when using `data_type` `pattern_list`.
-  config :worker_thread_count, :validate => :number, :default => 20
+  config :pattern_list_threads, :validate => :number, :default => 20
 
   # Maximum number of items for a single worker thread to process when `data_type` is `pattern_list`.
   # After the list is empty or this number of items have been processed, the thread will exit and a
   # new one will be started if there are non-empty lists matching the pattern without a consumer.
-  config :max_items_per_worker, :validate => :number, :default => 1000
+  config :pattern_list_max_items, :validate => :number, :default => 1000
 
   # Time to sleep in main loop after checking if more threads can/need to be spawned.
   # Applies to `data_type` is `pattern_list`
-  config :threadpool_queue_sleep, :validate => :number, :default => 0.2
+  config :pattern_list_threadpool_sleep, :validate => :number, :default => 0.2
 
   public
   # public API
@@ -95,10 +95,10 @@ def new_redis_instance
   end
 
   def init_threadpool
-    @threadpool_queue_max ||= 2 * @worker_thread_count
+    @threadpool_queue_max ||= 2 * @pattern_list_threads
     @threadpool ||= Concurrent::ThreadPoolExecutor.new(
-        min_threads: @worker_thread_count,
-        max_threads: @worker_thread_count,
+        min_threads: @pattern_list_threads,
+        max_threads: @pattern_list_threads,
         max_queue: @threadpool_queue_max
     )
     @items_processed ||= Concurrent::AtomicFixnum.new
@@ -263,7 +263,7 @@ def worker_consume(output_queue, key)
     @logger.debug("Launched worker for #{key}")
     redis = new_redis_instance
     begin
-      (0..@max_items_per_worker-1).each do
+      (0..@pattern_list_max_items-1).each do
         if stop?
           @logger.debug("Breaking from thread #{key} as it was requested to stop")
           break
@@ -320,7 +320,7 @@ def list_pattern_runner(output_queue)
       begin
         init_list_pattern_runner if @redis.nil?
         ensure_workers(output_queue)
-        sleep(@threadpool_queue_sleep)
+        sleep(@pattern_list_threadpool_sleep)
       rescue ::Redis::BaseError => e
         @logger.warn("Redis connection problem", :exception => e)
         @redis = nil