fluent-plugin-storm 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3514ad29ad0a40b372eb13868a7b85da90db9e8363c6e5ef70e9baf9695aef8f
-  data.tar.gz: 5c9982ddfec5be40c74a4a26b9ab31109b3aae5018572ecdf5cde1eb5449db60
+SHA1:
+  metadata.gz: a73e7623c06452e5172ff1067ea106a40851c964
+  data.tar.gz: 9498b5cdbbea3893892979bc34658d28573192ef
 SHA512:
-  metadata.gz: 80f09e701aa09a8ab2d30599ab3831f3953e81a2a0dac24e709d56649040a74d0887aff0e64b688ca656a676d483cf010a7ae32ae00c19353f2e960b81ef2395
-  data.tar.gz: f58e3466e9e78bd0bd990ae1d0a8659ac0ec722d7ab3606536aa89d75437ce6363be27e629a3cca5b3ad5fc2cf7ef9e23dfb9e6870a619820d907caf3ca8af2c
+  metadata.gz: 12380998b7fda91812018f915bf6d3c48ba59a6a76995cced84b267f92b51b7f205a8934e400930020258566efbe67eeba15d062892f2f41fbbd337e0bc6490b
+  data.tar.gz: 85eca4b4e9fec0318c34ddfc9b5897b374134043a661c7f3dfd3af2b144f5a1f049bfd55ba46d117aea9f25eb572560b0f79036f8bf71268f9dc2b77b0313658

data/fluent-plugin-storm.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-storm'
-  spec.version       = '0.0.3'
+  spec.version       = '0.0.4'
   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_storm.rb

@@ -1,8 +1,12 @@
 # coding: utf-8
-require 'fluent/input'
-module Fluent
-  class StormInput < Fluent::Input
+require 'json'
+require 'fluent/plugin/input'
+module Fluent::Plugin
+  class OsqueryInput < Fluent::Plugin::Input
     Fluent::Plugin.register_input('storm', self)
+
+    helpers :timer
+
     config_param :tag, :string, default: 'storm'
     config_param :interval, :integer, default: 60
     config_param :url, :string, default: 'http://localhost:8080'
@@ -17,7 +21,6 @@ module Fluent
       super
       require 'net/http'
       require 'uri'
-      require 'json'
     end
 
     def configure(conf)
@@ -25,32 +28,21 @@ 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_storm_timer, 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 = Hash.new(0)
       uri = URI.parse("#{@url}/api/v1/topology/summary")
-      @log.debug(uri)
+      log.debug(uri)
       Net::HTTP.start(uri.host, uri.port) do |http|
         request = Net::HTTP::Get.new(uri.request_uri)
         http.request(request) do |response|
@@ -76,29 +68,15 @@ module Fluent
                 emit_record.delete("configuration")
               end
             end
-            @log.debug(emit_record)
+            log.debug(emit_record)
             router.emit(@tag, @time, emit_record)
           end
         end
       end
     rescue => e
-      @log.error('faild to run', error: e.to_s, error_class: e.class.to_s)
-      @log.error_backtrace
+      log.error('faild to run', error: e.to_s, error_class: e.class.to_s)
+      log.error_backtrace
     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_storm'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-storm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Hidenori Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-06 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