fluent-plugin-mqtt-io 0.3.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d7e986a8afcf6c7a526c13cfaea4a80804dc441
-  data.tar.gz: e916f2585a275b982060ea8e8b6b4ec191a37c69
+  metadata.gz: 4fc0cec014b6bf816dd2d0b1772b88a1a070eacd
+  data.tar.gz: ea134724065a4c5bb99f7e3ee8fdaab0ca7a05b9
 SHA512:
-  metadata.gz: dda7025caf66c87d2d35ef1e3071822b9e286710c7e173218d1d6217275c5cb1ab141788196cf6ed014b7fc2f244470758d901cf25a56c50a85b8d835841c93e
-  data.tar.gz: fcca2b61a66583ca4e0544624d08e88d15b4f1e0b146c88fb11fe42fd6ea111a2bcff23fd650425f92053f023fe26f07eb52e0ccfa0682f65bd0195ddc93df1d
+  metadata.gz: e33d620814d9c7f5284163f8f22985fc583c2be740cc1f2dad6693540f72396b51c46fe7675232ce7a89418e47bdfaafb3ff0c5e39d6c8ab8394af1c52a19bda
+  data.tar.gz: e7c78a5f2b9b8da3c9a46345b0ae1ae40244e6911f1c89b9b0f1278f09eb833290be60c013d49f03b03820560b96da552b1fceebd57ffbe80f8b39710dc7f3a3

data/README.md

@@ -123,8 +123,7 @@ For fluent-plugin-mqtt-io ~> v0.3.0
 ```
 
 The options are basically the same as Input Plugin except for "format" and "bulk_trans" (only for Input). Additional options for Output Plugin are the following.
-- **qos**: Quality of Service (QoS) for message publishing, 0 or 1 is valid. 2 is not supported by mqtt client. Default is 1.
-- **retain**: If set true the broker will keep the message even after sending it to all current subscribers. Default is false
+
 - **time_key**: An attribute name used for timestamp field genarated from fluentd time field. Default is nil (omitted).
   If this option is omitted, timestamp field is not appended to the output record.
 - **time_format**: Output format of timestamp field. Default is ISO8601. You can specify your own format by using TimeParser.

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.10"
+  spec.version       = "0.4.0"
   spec.authors       = ["Toyokazu Akiyama"]
   spec.email         = ["toyokazu@gmail.com"]
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_dependency 'fluentd', '~> 0.14'
+  spec.add_dependency 'fluentd', [">= 0.14.0", "< 2"]
   spec.add_dependency "mqtt", "~> 0.5"
 
   spec.add_development_dependency "bundler", "~> 1.14"

data/lib/fluent/plugin/mqtt_proxy.rb

@@ -110,8 +110,6 @@ module Fluent::Plugin
         retry_connect(e, "System call error occurs.")
       rescue StandardError=> e
         retry_connect(e, "The other error occurs.")
-      rescue MQTT::NotConnectedException=> e
-        retry_connect(e, "MQTT not connected exception occurs.")
       end
     end
 

data/lib/fluent/plugin/out_mqtt.rb

@@ -18,11 +18,6 @@ module Fluent::Plugin
     desc 'Topic rewrite replacement string.'
     config_param :topic_rewrite_replacement, :string, default: nil
 
-    desc 'Retain option which publishing'
-    config_param :retain, :bool, default: false
-    desc 'QoS option which publishing'
-    config_param :qos, :integer, default: 1
-
     config_section :format do
       desc 'The format to publish'
       config_param :@type, :string, default: 'single_value'
@@ -144,12 +139,7 @@ module Fluent::Plugin
       chunk.each do |tag, time, record|
         rescue_disconnection do
           log.debug "MqttOutput#write: #{rewrite_tag(rewrite_tag(tag))}, #{time}, #{add_send_time(record)}"
-          @client.publish(
-            rewrite_tag(tag),
-            @formatter.format(tag, time, add_send_time(record)),
-            @retain,
-            @qos
-          )
+          @client.publish(rewrite_tag(tag), @formatter.format(tag, time, add_send_time(record)))
         end
       end
     end

data/test/plugin/test_out_mqtt.rb

@@ -21,8 +21,6 @@ class MqttOutputTest < Test::Unit::TestCase
         host 127.0.0.1
         port 1300
         client_id aa-bb-cc-dd
-        retain true
-        qos 2
         <format>
           @type json
         </format>
@@ -41,8 +39,6 @@ class MqttOutputTest < Test::Unit::TestCase
       assert_equal '127.0.0.1', d.instance.host
       assert_equal 1300, d.instance.port
       assert_equal true, d.instance.monitor.send_time
-      assert_equal true, d.instance.retain
-      assert_equal 2, d.instance.qos
       assert_equal 'aa-bb-cc-dd', d.instance.client_id
 
       assert_equal true, d.instance.security.use_tls

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mqtt-io
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: []
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: mqtt
   requirement: !ruby/object:Gem::Requirement