fluent-plugin-redis_list_poller 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5664df7a09d8c92d2eff417ca21e3e77c1469d96
-  data.tar.gz: f23f3179502d0104f0634e7acb5ad1bdc8abd430
+  metadata.gz: fe11a0f3a75660f2f69728aaa3b0eab0981e4a25
+  data.tar.gz: b9315ebc6d800236eeb92d76c7834cfb2ec2460c
 SHA512:
-  metadata.gz: 60ecb470169580c8b2a27ae5d7892f55d547680433ce16e66eb58d0141c0fbabf6d8e4c71de6c100fd8bfead32edae64e94928ad75d63e71691cb09c29ed7f38
-  data.tar.gz: 5a15699078c53d68f47cdbe5543ddabff3be92676e9d670ccc67a3739e8a8b0e6725a21620509dd5c89a833681dc451b3589a84a780039aa25ab30afb32fd08e
+  metadata.gz: 4a1f9d2fd8ca1e2988e1475b824de37e778ff7fcf9e34b7eb9ace0a8b508fbfb4be10037621af1c7e0cb06fa223a618232362ca88bae42b61d3c1f5035696a56
+  data.tar.gz: 7c5993c33b32436db596fbe95c6b2cc0a8f5234778a4202d88bbac9c135c7d59d6177139e173b72b38742a58bf69b613f1b0c85e634efe5bbbdbf5a404e7ddbb

data/CHANGELOG.txt

@@ -1,4 +1,13 @@
 # Changelog
 
-## 0.1.0
+v1.0.0
+---------------
+* Migrate poller parser configuration to Fluent 0.14's new dsl
+
+v0.1.1
+---------------
+* Migrate cool.io watchers to Fluent 0.14's new dsl
+
+v0.1.0
+---------------
 * Initial release

data/examples/standalone.conf

@@ -12,7 +12,11 @@
 	host 	127.0.0.1
 	key 	test
 	batch_size 1
-	poll_interval 1
+	poll_interval 0.5
+
+  <parse>
+    @type json
+  </parse>
 </source>
 
 <match redis.content>

data/fluent-plugin-redis_list_poller.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-redis_list_poller"
-  spec.version       = "0.1.0"
+  spec.version       = "1.0.0"
   spec.authors       = ["Jonathan Serafini"]
   spec.email         = ["jonathan@serafini.ca"]
 
@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 
-  spec.add_runtime_dependency "fluentd", [">= 0.12.0", "< 2"]
+  spec.add_runtime_dependency "fluentd", [">= 0.14.0", "< 2"]
 end

data/lib/fluent/plugin/in_redis_list_monitor.rb

@@ -7,9 +7,10 @@ module Fluent
     # output metrics to the login pipeline.
     # @since 0.1.0
     class RedisListMonitorInput < Input
-      include Fluent::PluginMixin::Redis
-
       Plugin.register_input('redis_list_monitor', self)
+      
+      include Fluent::PluginMixin::Redis
+      helpers :timer
 
       # input plugin parameters
       config_param :tag,      :string,  :default => nil
@@ -19,7 +20,6 @@ module Fluent
       # @return [NilClass]
       def initialize
         super
-        require 'cool.io'
       end
 
       # Initialize attributes and parameters
@@ -63,44 +63,22 @@ module Fluent
       def start
         super
 
-        @loop = Coolio::Loop.new
-
         start_redis
         start_poller
-
-        @thread = Thread.new(&method(:run))
       end
 
       def start_poller
-        @poller = TimerWatcher.new(
-          @poll_interval,
-          log,
-          &method(:action_poll)
-        )
-
-        @loop.attach(@poller)
-      end
-
-      # Begin the logging pipeline
-      # @since 0.1.0
-      # @return [NilClass]
-      def run
-        @loop.run
-      rescue => e
-        log.error "unexpected error", :error => e
-        log.error_backtrace
+        timer_execute(:poll, @poll_interval) do
+          action_poll
+        end
       end
 
       # Tear down the plugin
       # @since 0.1.0
       # @return [NilClass]
       def shutdown
-        @loop.watchers.each { |w| w.detach }
-        @loop.stop
-        Thread.kill(@thread)
-        @thread.join
-        shutdown_redis
         super
+        shutdown_redis
       end
 
       # Wether the poller has been temporarily disabled or should fetch messages
@@ -150,25 +128,6 @@ module Fluent
         log.error_backtrace
         sleep!(@retry_interval)
       end
-
-      # Generic Cool.io timer which will execute a given callback on schedule.
-      # @since 0.1.0
-      class TimerWatcher < Coolio::TimerWatcher
-        attr_reader :log
-
-        def initialize(interval, log, &callback)
-          @callback = callback
-          @log = log
-          super(interval, true)
-        end
-
-        def on_timer
-          @callback.call
-        rescue => e
-          log.error "unexpected error", :error=>e
-          log.error_backtrace
-        end
-      end
     end
   end
 end

data/lib/fluent/plugin/in_redis_list_poller.rb

@@ -1,4 +1,6 @@
 require "fluent/plugin/input"
+require "fluent/plugin/parser"
+require 'fluent/process'
 require "fluent/plugin_mixin/redis"
 
 module Fluent
@@ -7,8 +9,8 @@ module Fluent
       include Fluent::PluginMixin::Redis
 
       Plugin.register_input('redis_list_poller', self)
-
       helpers :storage
+      helpers :timer
 
       # redis list details
       # - command: redis command to execute when fetching messages
@@ -18,14 +20,17 @@ module Fluent
 
       # input plugin parameters
       config_param :tag,      :string,  :default => nil
-      config_param :format,   :string,  :default => "json"
+
+      # parser plugin parameters
+      config_section :parse, :init => true, :multi => false do
+        config_set_default :@type, "json"
+      end
 
       # Initialize new input plugin
       # @since 0.1.0
       # @return [NilClass]
       def initialize
         super
-        require 'cool.io'
         require 'msgpack'
       end
 
@@ -46,7 +51,7 @@ module Fluent
       # @since 0.1.0
       # @return [NilClass]
       def configure_params(config)
-        %w(host port key command format tag).each do |key|
+        %w(host port key command tag).each do |key|
           next if instance_variable_get("@#{key}")
           raise Fluent::ConfigError, "configuration key missing: #{key}"
         end
@@ -60,8 +65,10 @@ module Fluent
       # @since 0.1.0
       # @return [NilClass]
       def configure_parser(config)
-        @parser = Plugin.new_parser(@format)
-        @parser.configure(config)
+        parser_config = @parse.corresponding_config_element
+        parser_type = parser_config['@type']
+        @parser = Fluent::Plugin.new_parser(parser_type, :parent => self)
+        @parser.configure(parser_config)
       end
 
       # Configure locking
@@ -81,11 +88,9 @@ module Fluent
       # @return [NilClass]
       def start
         super
-
-        @loop = Coolio::Loop.new
         start_redis
         start_poller
-        @thread = Thread.new(&method(:run))
+        start_monitor
       end
 
       # Prepare the Redis queue poller
@@ -96,42 +101,30 @@ module Fluent
       # @since 0.1.0
       # @return [NilClass]
       def start_poller
-        @poller = TimerWatcher.new(
-          @poll_interval,
-          log,
-          &method(:action_poll)
-        )
-
-        @lock_monitor = TimerWatcher.new(
-          1,
-          log,
-          &method(:action_locking_monitor)
-        )
-
-        @loop.attach(@poller)
-        @loop.attach(@lock_monitor)
+        timer_execute(:poller, @poll_interval) do
+          action_poll
+        end
       end
 
-      # Begin the logging pipeline
-      # @since 0.1.0
+      # Prepare the Redis queue monitor
+      #
+      # This timed event will routinely poll for a lock key and disable the
+      # queue poller if required
+      #
+      # @since 0.1.1
       # @return [NilClass]
-      def run
-        @loop.run
-      rescue => e
-        log.error "unexpected error", :error => e
-        log.error_backtrace
+      def start_monitor
+        timer_execute(:monitor, 1) do
+          action_locking_monitor
+        end
       end
 
       # Tear down the plugin
       # @since 0.1.0
       # @return [NilClass]
       def shutdown
-        @loop.watchers.each { |w| w.detach }
-        @loop.stop
-        Thread.kill(@thread)
-        @thread.join
-        shutdown_redis
         super
+        shutdown_redis
       end
 
       # Whether to fetch a single item or a multiple items in batch
@@ -239,25 +232,6 @@ module Fluent
         log.error_backtrace
         sleep!(@retry_interval)
       end
-
-      # Generic Cool.io timer which will execute a given callback on schedule.
-      # @since 0.1.0
-      class TimerWatcher < Coolio::TimerWatcher
-        attr_reader :log
-
-        def initialize(interval, log, &callback)
-          @callback = callback
-          @log = log
-          super(interval, true)
-        end
-
-        def on_timer
-          @callback.call
-        rescue => e
-          log.error "unexpected error", :error => e
-          log.error_backtrace
-        end
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redis_list_poller
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jonathan Serafini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'