fluent-plugin-jmx 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a1d8908ee152d57ffa0f9e7157aac2f4fc2b864865b65ea04a5a042cea3ca046
-  data.tar.gz: b7e7c68d00f9ad0f4e55451665cff0242688b3e15c66882efc3287b34f0823e7
+SHA1:
+  metadata.gz: 3b435cebb2100308fea20da3a684b929d5e829fd
+  data.tar.gz: e8be9e39ace82fe49f99c6d1ce465721a8df8950
 SHA512:
-  metadata.gz: 482cd9f336a03f6c368152f10e82353c5c4e7e6524ac3a78e1baf44325158881628049b71f386ef47c95bcbfda4c7b15d2cbaa33dc59326e71592d727a4d6ccb
-  data.tar.gz: 4774c41f015d68413e63d73763b51fda46cf9d048ed3dfd435fbd061ac48dc22d519e57eb1a22b40e5c6e55956b13ac0048e05fe01b33a72ea34647afbf0fe23
+  metadata.gz: 5d7ce55d531089388392d6fc26c9889ce44998afccb9300734c44fb64ae3ac441c0e0133e33439759c093a43d00929d0a36d0eea2d645c7375a0d88f15ba7a43
+  data.tar.gz: 726741e7b44f85af840aa3690614e4be77c5e239e7098ab92eacd41223cbcca6f2688e98ac1459613392cd9a9cd6fbded1404928b6bac54049f6c0376c1a53f2

data/fluent-plugin-jmx.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-jmx'
-  spec.version       = '0.0.4'
+  spec.version       = '0.0.5'
   spec.authors       = ['Hidenori Suzuki']
   spec.email         = ['hidenori.suzuki@yahoo.com']
   spec.summary       = 'a fluent plugin'
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'fluentd', '~> 1.2.6'
+  spec.add_runtime_dependency 'fluentd', '~> 1.2.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/fluent/plugin/in_jmx.rb

@@ -1,8 +1,12 @@
 # coding: utf-8
-require 'fluent/input'
-module Fluent
-  class JmxInput < Fluent::Input
+require 'json'
+require 'fluent/plugin/input'
+module Fluent::Plugin
+  class OsqueryInput < Fluent::Plugin::Input
     Fluent::Plugin.register_input('jmx', self)
+
+    helpers :timer
+
     config_param :tag, :string, default: 'jmx'
     config_param :interval, :integer, default: 60
     config_param :url, :string, default: 'http://127.0.0.1:8778/jolokia'
@@ -18,7 +22,6 @@ module Fluent
       super
       require 'net/http'
       require 'uri'
-      require 'json'
     end
 
     def configure(conf)
@@ -26,31 +29,20 @@ module Fluent
     end
 
     def start
-      @loop = Coolio::Loop.new
-      @tw = TimerWatcher.new(interval, true, log, &method(:execute))
-      @tw.attach(@loop)
-      @thread = Thread.new(&method(:run))
+      super
+      timer_execute(:in_jmx, interval, &method(:execute))
     end
 
     def shutdown
-      @tw.detach
-      @loop.stop
-      @thread.join
-    end
-
-    def run
-      @loop.run
-    rescue => e
-      @log.error 'unexpected error', error: e.to_s
-      @log.error_backtrace
+      super
     end
 
     private
 
     def execute
-      @time = Engine.now
+      @time = Fluent::Engine.now
       record = _get_record
-      @log.debug(record)
+      log.debug(record)
       router.emit(@tag, @time, record)
     rescue => e
       @log.error('faild to run', error: e.to_s, error_class: e.class.to_s)
@@ -74,20 +66,5 @@ module Fluent
       end
       record
     end
-
-    class TimerWatcher < Coolio::TimerWatcher
-      def initialize(interval, repeat, log, &callback)
-        @log = log
-        @callback = callback
-        super(interval, repeat)
-      end
-
-      def on_timer
-        @callback.call
-      rescue => e
-        @log.error e.to_s
-        @log.error_backtrace
-      end
-    end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 require 'fluent/test'
+require 'fluent/test/driver/input'
 require 'fluent/plugin/in_jmx'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jmx
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Hidenori Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: a fluent plugin