fluent-plugin-grassland 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a50827624e60eb0a7e3aa7ece74ccb3b4ee63800efe9d5b882fd07667f98c0
-  data.tar.gz: 33dc0fcfe60b74de19c3fdcbca92362aff2bf0a9e4391bbb80a724b8d6685625
+  metadata.gz: 0a58e5705d031e2680d0e20166851d5837aea29de2e0f635700b1b42315849c0
+  data.tar.gz: 925f4f26f5d36c91d06a3f08eb0994a0992a1fb2548af1c5ebc7677c9a0d1cb0
 SHA512:
-  metadata.gz: 4ec89f13aeae1939aba751a8e87b03851b7316bfbc772dfab2d6247602d61236c0eaec16eef3bd67f320aa9fc9772849cca6d6f0830b96032296847c6393fcec
-  data.tar.gz: e7272781f77dfbaf0afa8d512e23ac56d8f8e05b0a9732a3ab0c5ad7223ed7af9eacbc763b3020370b30a653110122e3293c1a9b6fb8dcf65c223f11bf0355b5
+  metadata.gz: f376fe29cdc9881dd025c545d98532b05596143841dd28175d514e626d34fe4625569cf5fb68b6cb0bfe450da29a69978c42fca00ff2fbfb65131aeede340eff
+  data.tar.gz: 5e5484eaa1b00cd6d09dd025062e885f78760355946f8f3981f80bffa0491191153af97fff4660d230444cc12297e3b3e3660896bd6cd1c9897ead98928271ca

data/fluent-plugin-grassland.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-grassland'
-  spec.version       = '0.2.0'
+  spec.version       = '0.2.1'
   spec.authors       = ['Ripplation Inc.']
   # spec.email         = ['xxxxxx@ripplation.co.jp']
   spec.description   = 'Output filter plugin for Grassland'

data/lib/fluent/plugin/out_grassland.rb

@@ -1,6 +1,9 @@
-module Fluent
-  class GrasslandOutput < Fluent::BufferedOutput
-    Fluent::Plugin.register_output('grassland', self)
+require 'syslog/logger'
+require 'fluent/plugin/output'
+
+module Fluent::Plugin
+  class GrasslandOutput < Fluent::Plugin::Output
+    Fluent::Plugin.register_output("grassland", self)
 
     attr_accessor :random
     attr_accessor :kinesis
@@ -16,6 +19,10 @@ module Fluent
       require 'net/http'
       require 'uri'
       @random = Random.new
+
+      log = Syslog::Logger.new 'grasslandplugin'
+      log.info 'grassland initialize'
+      # puts "grassland initialize"
     end
 
     config_param :apiuri,               :string,  :default => 'https://grassland.biz/credentials'
@@ -60,14 +67,14 @@ module Fluent
       begin
         setCredential
         configure_aws
-        @kinesis.client.put_record({
+        @kinesis.put_record({
           :stream_name   => @stream_name,
           :data          => "test",
           :partition_key => "#{random.rand(999)}"
         })
-        puts "fluentd: reset credential"
+        log.info "grassland: reset credential"
       rescue => e
-        puts [e.class, e].join(" : initialize error.")
+        log.info [e.class, e].join(" : initialize error.")
       end
     end
 
@@ -100,11 +107,11 @@ module Fluent
           warn "redirected to #{location}"
           get_json(location, limit - 1)
         else
-          puts [uri.to_s, response.value].join(" : ")
+          log.info [uri.to_s, response.value].join(" : ")
           # handle error
         end
       rescue => e
-        puts [uri.to_s, e.class, e].join(" : ")
+        log.info [uri.to_s, e.class, e].join(" : ")
         # handle error
       end
     end
@@ -113,7 +120,7 @@ module Fluent
       # print(record)
       ['dt', 'd'].each do |key|
         unless record.has_key?(key)
-          puts "input data error: '#{key}' is required"
+          log.info "input data error: '#{key}' is required"
           return ""
         end
       end
@@ -139,13 +146,15 @@ module Fluent
 
       begin
         dataList.each do |data|
+          # debug log
+          # log.info data.to_json
           if bufList[":#{data['pk']}"] == nil then
             bufList[":#{data['pk']}"] = "#{data.to_json},"
           else
             bufList[":#{data['pk']}"] += "#{data.to_json},"
           end
           if bufList[":#{data['pk']}"].bytesize >= 30720 then
-            @kinesis.client.put_record({
+            @kinesis.put_record({
               :stream_name   => @stream_name,
               :data          => "["+bufList[":#{data['pk']}"].chop+"]",
               :partition_key => partitionKeys[random.rand(partitionKeys.length)]
@@ -156,7 +165,7 @@ module Fluent
         end
         dataList.each do |data|
           if bufList[":#{data['pk']}"] != nil then
-            @kinesis.client.put_record({
+            @kinesis.put_record({
               :stream_name   => @stream_name,
               :data          => "["+bufList[":#{data['pk']}"].chop+"]",
               :partition_key => partitionKeys[random.rand(partitionKeys.length)]
@@ -166,7 +175,7 @@ module Fluent
           end
         end
       rescue
-        puts "error: put_record to grassland. maybe too many requests. few data dropped."
+        log.info "error: put_record to grassland. maybe too many requests. few data dropped."
       end
     end
 
@@ -188,8 +197,7 @@ module Fluent
         )
       end
 
-      @kinesis = AWS::Kinesis::Client.new(options)
-      # AWS.config(options)
+      @kinesis = Aws::Kinesis::Client.new(options)
     end
   end
-end
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grassland
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ripplation Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-17 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Output filter plugin for Grassland