fluent-plugin-mqtt-io 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ec56bcb964c914765afcd471b69413e623a54d
-  data.tar.gz: d7784e5b1e39d416cec4b40a1868ca72fe0f3afc
+  metadata.gz: 97803d6c5941eb7ff068d9d8e7205c9a78cc629b
+  data.tar.gz: 8f492394371c32718ad1f97181597efe2192bf08
 SHA512:
-  metadata.gz: 62e831aece6900ea1b8f3b8b98fae4cf0391c2bf223803dba5ba8aecd2182c103172523793721ab25bf5279f266e193a3dd4bf86b79167c51b197d44e9ea9475
-  data.tar.gz: 3efb8116780288682a990f56c98b4b338a7823e037f9a5088e62071d537b9d2e330841bb06fb68b4adb02ac90ffd93382b1694ef13557cb288326795a3f2c167
+  metadata.gz: a022d9dd82ed38ced4b9cfc89e7d01da5cca628dd6030bc36687df3594409dc25953a027ab9a5a2390f3aa7ef12081114b46c81311d8904a52e342f71f14cd3c
+  data.tar.gz: 00e999e1448d738401eca559d54670c2dff6586f534342af9d09c9caf3f9f745b4bcbbc3704e55210b55485f7bf210e8cce54c21358ce96c00b8be3a0728802b

data/fluent-plugin-mqtt-io.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mqtt-io"
-  spec.version       = "0.3.0"
+  spec.version       = "0.3.1"
   spec.authors       = ["Toyokazu Akiyama"]
   spec.email         = ["toyokazu@gmail.com"]
 

data/lib/fluent/plugin/in_mqtt.rb

@@ -12,48 +12,48 @@ module Fluent::Plugin
     MQTT_PORT = 1883
 
     desc 'The address to connect to.'
-    config_param :host, :string, :default => '127.0.0.1'
+    config_param :host, :string, default: '127.0.0.1'
     desc 'The port to connect to.'
-    config_param :port, :integer, :default => MQTT_PORT
+    config_param :port, :integer, default: MQTT_PORT
     desc 'The topic to subscribe.'
-    config_param :topic, :string, :default => '#'
+    config_param :topic, :string, default: '#'
     desc 'The format to receive.'
-    config_param :format, :string, :default => 'json'
+    config_param :format, :string, default: 'json'
     desc 'Specify keep alive interval.'
-    config_param :keep_alive, :integer, :default => 15
+    config_param :keep_alive, :integer, default: 15
     desc 'Specify initial interval for reconnection.'
-    config_param :initial_interval, :integer, :default => 1
+    config_param :initial_interval, :integer, default: 1
     desc 'Specify increasing ratio of reconnection interval.'
-    config_param :retry_inc_ratio, :integer, :default => 2
+    config_param :retry_inc_ratio, :integer, default: 2
 
     # bulk_trans is deprecated
     # multiple entries must be inputted as an Array
-    #config_param :bulk_trans, :bool, :default => true
-    #config_param :bulk_trans_sep, :string, :default => "\t"
+    #config_param :bulk_trans, :bool, default: true
+    #config_param :bulk_trans_sep, :string, default: "\t"
 
     config_section :security, required: false, multi: false do
       ### User based authentication
       desc 'The username for authentication'
-      config_param :username, :string, :default => nil
+      config_param :username, :string, default: nil
       desc 'The password for authentication'
-      config_param :password, :string, :default => nil
+      config_param :password, :string, default: nil
       desc 'Use TLS or not.'
-      config_param :use_tls, :bool, :default => nil
+      config_param :use_tls, :bool, default: nil
       config_section :tls, required: false, multi: true do
         desc 'Specify TLS ca file.'
-        config_param :ca_file, :string, :default => nil
+        config_param :ca_file, :string, default: nil
         desc 'Specify TLS key file.'
-        config_param :key_file, :string, :default => nil
+        config_param :key_file, :string, default: nil
         desc 'Specify TLS cert file.'
-        config_param :cert_file, :string, :default => nil
+        config_param :cert_file, :string, default: nil
       end
     end
 
     config_section :monitor, required: false, multi: false do
       desc 'Record received time into message or not.'
-      config_param :recv_time, :bool, :default => false
+      config_param :recv_time, :bool, default: false
       desc 'Specify the attribute name of received time.'
-      config_param :recv_time_key, :string, :default => "recv_time"
+      config_param :recv_time_key, :string, default: "recv_time"
     end
 
     def configure(conf)
@@ -77,14 +77,14 @@ module Fluent::Plugin
     end
 
     def sleep_retry_interval(e, message)
-      $log.error "#{message},#{e.class},#{e.message}"
-      $log.error "Retry in #{@retry_interval} sec"
+      log.error "#{message},#{e.class},#{e.message}"
+      log.error "Retry in #{@retry_interval} sec"
       sleep @retry_interval
       increment_retry_interval
     end
 
     def start
-      $log.debug "start mqtt #{@host}"
+      log.debug "start mqtt #{@host}"
       opts = {
         host: @host,
         port: @port,
@@ -140,7 +140,7 @@ module Fluent::Plugin
     def add_recv_time(record)
       if @recv_time
         # recv_time is recorded in ms
-        record.merge({@recv_time_key => Fluent::EventTime.now})
+        record.merge({"#{@recv_time_key}": Fluent::EventTime.now})
       else
         record
       end
@@ -149,10 +149,10 @@ module Fluent::Plugin
     def parse(message)
       @parser.parse(message) do |time, record|
         if time.nil?
-          $log.debug "Since time_key field is nil, Fluent::EventTime.now is used."
+          log.debug "Since time_key field is nil, Fluent::EventTime.now is used."
           time = Fluent::EventTime.now
         end
-        $log.debug "#{topic}, #{time}, #{add_recv_time(record)}"
+        log.debug "#{topic}, #{time}, #{add_recv_time(record)}"
         return [time, add_recv_time(record)]
       end
     end
@@ -171,8 +171,8 @@ module Fluent::Plugin
           router.emit(tag, time, record)
         end
       rescue Exception => e
-        $log.error :error => e.to_s
-        $log.debug_backtrace(e.backtrace)
+        log.error error: e.to_s
+        log.debug_backtrace(e.backtrace)
       end
     end
 

data/lib/fluent/plugin/out_mqtt.rb

@@ -12,43 +12,43 @@ module Fluent::Plugin
     MQTT_PORT = 1883
 
     desc 'The address to connect to.'
-    config_param :host, :string, :default => '127.0.0.1'
+    config_param :host, :string, default: '127.0.0.1'
     desc 'The port to connect to.'
-    config_param :port, :integer, :default => MQTT_PORT
+    config_param :port, :integer, default: MQTT_PORT
     desc 'MQTT keep alive interval.'
-    config_param :keep_alive, :integer, :default => 15
+    config_param :keep_alive, :integer, default: 15
     desc 'Topic rewrite matching pattern.'
-    config_param :topic_rewrite_pattern, :string, :default => nil
+    config_param :topic_rewrite_pattern, :string, default: nil
     desc 'Topic rewrite replacement string.'
-    config_param :topic_rewrite_replacement, :string, :default => nil
+    config_param :topic_rewrite_replacement, :string, default: nil
     desc 'Initial retry interval.'
-    config_param :initial_interval, :integer, :default => 1
+    config_param :initial_interval, :integer, default: 1
     desc 'Increasing ratio of retry interval.'
-    config_param :retry_inc_ratio, :integer, :default => 2
+    config_param :retry_inc_ratio, :integer, default: 2
 
     config_section :security, required: false, multi: false do
       ### User based authentication
       desc 'The username for authentication'
-      config_param :username, :string, :default => nil
+      config_param :username, :string, default: nil
       desc 'The password for authentication'
-      config_param :password, :string, :default => nil
+      config_param :password, :string, default: nil
       desc 'Use TLS or not.'
-      config_param :use_tls, :bool, :default => nil
+      config_param :use_tls, :bool, default: nil
       config_section :tls, required: false, multi: true do
         desc 'TLS ca file.'
-        config_param :ca_file, :string, :default => nil
+        config_param :ca_file, :string, default: nil
         desc 'TLS key file.'
-        config_param :key_file, :string, :default => nil
+        config_param :key_file, :string, default: nil
         desc 'TLS cert file.'
-        config_param :cert_file, :string, :default => nil
+        config_param :cert_file, :string, default: nil
       end
     end
 
     config_section :monitor, required: false, multi: false do
       desc 'Recording send time for monitoring.'
-      config_param :send_time, :bool, :default => false
+      config_param :send_time, :bool, default: false
       desc 'Recording key name of send time for monitoring.'
-      config_param :send_time_key, :string, :default => "send_time"
+      config_param :send_time_key, :string, default: "send_time"
     end
 
     # This method is called before starting.
@@ -72,8 +72,8 @@ module Fluent::Plugin
     end
 
     def sleep_retry_interval(e, message)
-      $log.error "#{message},#{e.class},#{e.message}"
-      $log.error "Retry in #{@retry_interval} sec"
+      log.error "#{message},#{e.class},#{e.message}"
+      log.error "Retry in #{@retry_interval} sec"
       sleep @retry_interval
       increment_retry_interval
     end
@@ -95,7 +95,7 @@ module Fluent::Plugin
     def start
       super
 
-      $log.debug "start to connect mqtt broker #{@host}:#{@port}"
+      log.debug "start to connect mqtt broker #{@host}:#{@port}"
       opts = {
         host: @host,
         port: @port,
@@ -182,7 +182,7 @@ module Fluent::Plugin
     def add_send_time(record)
       if @send_time
         # send_time is recorded in ms
-        record.merge({@send_time_key => Fluent::EventTime.now})
+        record.merge({"#{@send_time_key}": Fluent::EventTime.now})
       else
         record
       end
@@ -192,7 +192,7 @@ module Fluent::Plugin
       if es.class == Fluent::OneEventStream
         es = inject_values_to_event_stream(tag, es)
         es.each do |time, record|
-          $log.debug "#{rewrite_tag(tag)}, #{add_send_time(record)}"
+          log.debug "#{rewrite_tag(tag)}, #{add_send_time(record)}"
           publish_error_handler do
             @client.publish(rewrite_tag(tag), @formatter.format(tag, time, add_send_time(record)))
           end
@@ -201,14 +201,14 @@ module Fluent::Plugin
         es = inject_values_to_event_stream(tag, es)
         array = []
         es.each do |time, record|
-          $log.debug "#{rewrite_tag(tag)}, #{add_send_time(record)}"
+          log.debug "#{rewrite_tag(tag)}, #{add_send_time(record)}"
           array << add_send_time(record)
         end
         publish_error_handler do
           @client.publish(rewrite_tag(tag), @formatter.format(tag, Fluent::EventTime.now, array))
         end
       end
-      $log.flush
+      log.flush
     end
 
     def process(tag, es)

data/test/helper.rb

@@ -1,26 +1,6 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/setup'
 require 'test/unit'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
+$LOAD_PATH.unshift(__dir__)
 require 'fluent/test'
-unless ENV.has_key?('VERBOSE')
-  nulllogger = Object.new
-  nulllogger.instance_eval {|obj|
-    def method_missing(method, *args)
-      # pass
-    end
-  }
-  $log = nulllogger
-end
-
-class Test::Unit::TestCase
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mqtt-io
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Toyokazu Akiyama