fluent-plugin-dstat 0.3.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 689378189e1225c23f9d6e083077f40d3760833d
-  data.tar.gz: f8fb4a49ab1d3586ab5ec4c72fb6c157c5d4a163
+SHA256:
+  metadata.gz: dbcaf16559713e0913d2160ae9b2b081848474984d42b5e3227582a6eb9c2b4a
+  data.tar.gz: d39be7e49a80312eefd977137c19cf72a9bca3edae92be5c424a4093c2202869
 SHA512:
-  metadata.gz: 4dd33c9bbad811a3f60bb0a352d8294829f4ec87e5dd8d52d68fa05109fd550ef7ceb40f07368c023133938f0a45fc0509e1422575b377893569cb7f2f8bc7d7
-  data.tar.gz: 0a0a1cb719f99b1cb0e1944a1782e556e15733924f588ff06db27ae7d6b7d84e04c9689934c35fa6487c6b8e5ac3bfc5b20240f3483ff4afa69d77576c408c01
+  metadata.gz: ac260e611e6a09257d8c4bc27ea4092fa17a124d4983da273f9fa897994fd34d38c31330e6cbe99181055262ae61463241177f67a10eecaf4dfeeb349c4107e0
+  data.tar.gz: 1edcf9ba3e298ef4dc442718bb6611abbe1ae8d1a0d19dc19c7be18c88bbd04a5365870b0db4509c4f61eca9953cd600b1c8aba25a210c6129cf4c431dcd21f8

data/fluent-plugin-dstat.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-dstat"
-  s.version = "0.3.3"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -31,24 +31,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = "2.4.5"
   s.summary = "Dstat Input plugin for Fluent event collector"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
-      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 3.0.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-    else
-      s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
-      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 3.0.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-    end
-  else
-    s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
-    s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 3.0.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-  end
+  s.add_runtime_dependency(%q<fluentd>, [">= 0.14.0", "< 2"])
+  s.add_development_dependency(%q<rdoc>, [">= 0"])
+  s.add_development_dependency(%q<test-unit>, [">= 3.0.0"])
+  s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+  s.add_development_dependency(%q<rake>, ["~> 12.0"])
 end

data/lib/fluent/plugin/in_dstat.rb

@@ -1,9 +1,11 @@
-require 'fluent/input'
+require 'fluent/plugin/input'
 
-module Fluent
+module Fluent::Plugin
   class DstatInput < Input
 
-    Plugin.register_input('dstat', self)
+    Fluent::Plugin.register_input('dstat', self)
+
+    helpers :timer, :event_loop
 
     def initialize
       super
@@ -24,6 +26,10 @@ module Fluent
       end
     end
 
+    unless method_defined?(:log)
+      define_method("log") { $log }
+    end
+
     desc "the tag of event"
     config_param :tag, :string
     desc "dstat command path"
@@ -46,47 +52,35 @@ module Fluent
       begin
         `#{@dstat_path} --version`
       rescue Errno::ENOENT
-        raise ConfigError, "'#{@dstat_path}' command not found. Install dstat before run fluentd"
+        raise Fluent::ConfigError, "'#{@dstat_path}' command not found. Install dstat before run fluentd"
       end
     end
 
     def check_dstat
       now = Time.now
       if now - @last_time > @delay * 3
-        $log.info "Process dstat(#{@pid}) is stopped. Last updated: #{@last_time}"
+        log.info "Process dstat(#{@pid}) is stopped. Last updated: #{@last_time}"
         restart
       end
     end
 
     def start
+      super
       system("mkfifo #{@tmp_file}")
       @io = IO.popen(@command, "r")
       @pid = @io.pid
 
-      @loop = Coolio::Loop.new
       @dw = DstatCSVWatcher.new(@tmp_file, &method(:receive_lines))
-      @dw.attach(@loop)
-      @tw = TimerWatcher.new(1, true,  &method(:check_dstat))
-      @tw.attach(@loop)
-      @thread = Thread.new(&method(:run))
+      event_loop_attach(@dw)
+      @tw = timer_execute(:in_dstat_timer, 1, &method(:check_dstat))
     end
 
     def shutdown
       Process.kill(:TERM, @pid)
       @dw.detach
       @tw.detach
-      @loop.stop
-      @thread.join
       File.delete(@tmp_file)
-    end
-
-    def run
-      begin
-        @loop.run
-      rescue
-        $log.error "unexpected error", :error=>$!.to_s
-        $log.error_backtrace
-      end
+      super
     end
 
     def restart
@@ -94,8 +88,8 @@ module Fluent
       begin
         Process.kill(:TERM, @pid)
       rescue Errno::ESRCH => e
-        $log.error "unexpected death of a child process", :error=>e.to_s
-        $log.error_backtrace
+        log.error "unexpected death of a child process", :error=>e.to_s
+        log.error_backtrace
       end
       @dw.detach
       @tw.detach
@@ -104,9 +98,8 @@ module Fluent
       @io = IO.popen(@command, "r")
       @pid = @io.pid
       @dw = DstatCSVWatcher.new(@tmp_file, &method(:receive_lines))
-      @dw.attach(@loop)
-      @tw = TimerWatcher.new(1, true,  &method(:check_dstat))
-      @tw.attach(@loop)
+      event_loop_attach(@dw)
+      @tw = timer_execute(:in_dstat_timer, 1, &method(:check_dstat))
     end
 
     def receive_lines(lines)
@@ -144,7 +137,7 @@ module Fluent
             'hostname' => @hostname,
             'dstat' => data
           }
-          router.emit(@tag, Engine.now, record)
+          router.emit(@tag, Fluent::Engine.now, record)
         end
         @line_number += 1
         @last_time = Time.now
@@ -175,19 +168,5 @@ module Fluent
         # will be readable on next event
       end
     end
-
-    class TimerWatcher < Cool.io::TimerWatcher
-      def initialize(interval, repeat, &check_dstat)
-        @check_dstat = check_dstat
-        super(interval, repeat)
-      end
-
-      def on_timer
-        @check_dstat.call
-      rescue
-        $log.error $!.to_s
-        $log.error_backtrace
-      end
-    end
   end
 end

data/test/helper.rb

@@ -13,6 +13,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'fluent/test'
+require 'fluent/test/driver/input'
 require 'fluent/plugin/in_dstat'
 
 class Test::Unit::TestCase

data/test/plugin/test_in_dstat.rb

@@ -20,7 +20,7 @@ class DstatInputTest < Test::Unit::TestCase
   ]
 
   def create_driver(conf=CONFIG)
-    Fluent::Test::InputTestDriver.new(Fluent::DstatInput).configure(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::DstatInput).configure(conf)
   end
 
   def test_configure
@@ -44,19 +44,17 @@ class DstatInputTest < Test::Unit::TestCase
   def emit_with_conf(conf)
     d = create_driver(conf)
 
-    d.run do
-      sleep 2
-    end
+    d.run(expect_emits: 1)
 
     length = `dstat #{d.instance.option} #{d.instance.delay} 1`.split("\n")[0].split("\s").length
     puts `dstat #{d.instance.option} #{d.instance.delay} 3`
 
-    emits = d.emits
-    assert_equal true, emits.length > 0
-    assert_equal length, emits[0][2]['dstat'].length
+    events = d.events
+    assert_equal true, events.length > 0
+    assert_equal length, events[0][2]['dstat'].length
 
     puts "--- #{d.instance.option} ---"
-    puts emits[0][2]
+    puts events[0][2]
     puts "--- end ---"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dstat
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Shunsuke Mikami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.7
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.7
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -37,7 +37,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 description: 
 email: shun0102@gmail.com
 executables: []
@@ -111,9 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Dstat Input plugin for Fluent event collector
 test_files: []
-has_rdoc: