fluent-plugin-mqtt-io 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d00a8d71f16ee4a7f7c25d5c6432e1786159728
-  data.tar.gz: 54654b5f2cf2dca79f443a3e376a1bd323b4514f
+  metadata.gz: c1403811416a6ec5ae4b65f1e2f910425c78464f
+  data.tar.gz: 36025a84dafc6aacc2295c76cd0a9f8110563514
 SHA512:
-  metadata.gz: d061d3b17e90904f305b1310992e78aa4ebd26659fa9c10218e741b43b4d464157757d4c52c41a423b784dfb3409c23315e3bd0cc90f3cbb16f3d45af63b268b
-  data.tar.gz: 52628b2004bd6e0c492c12ce3fe4e24d073d4d02c9e21a7499ea0579c67313ee27108d71f6cd388156800f40d356d3bf57a386b71b3201afa6a020fef669083d
+  metadata.gz: 64ae726ba5f10ba20d16692626cd9ce1d6424fe1a0aacd735fbacd73f3bf3c927c07838980907e9bb5ef89b3227eb7c03b64b82979de5df3825e168a5a58d5c8
+  data.tar.gz: 9501641e21422a5fa755550a1e9a32427515e03ef9cfd3721095bbcdb2d6d806e03e36d71b35a1a8d334696a6d7f5e42127145e4bbad970bb89562f4c83ce2a6

data/README.md

@@ -5,7 +5,7 @@ Mqtt::IO Plugin is deeply inspired by Fluent::Plugin::Mqtt.
 
 https://github.com/yuuna/fluent-plugin-mqtt
 
-Mqtt::IO plugin focus on federating components, e.g. sensors, messaging platform and databases.
+Mqtt::IO plugin focus on federating components, e.g. sensors, messaging platform and databases. Encryption/Decription is not supported in this plugin but [fluent-plugin-jwt-filter](https://github.com/toyokazu/fluent-plugin-jwt-filter) can be used to encrypt/decrypt messages using JSON Web Token technology.
 
 ## Installation
 
@@ -43,23 +43,25 @@ Input Plugin can be used via source directive in the configuration.
 
 The default MQTT topic is "#". Configurable options are the following:
 
-- host: IP address of MQTT broker
-- port: Port number of MQTT broker
-- format (mandatory): Input parser can be chosen, e.g. json, xml
+- **host**: IP address of MQTT broker
+- **port**: Port number of MQTT broker
+- **format** (mandatory): Input parser can be chosen, e.g. json, xml
   - In order to use xml format, you need to install [fluent-plugin-xml-parser](https://github.com/toyokazu/fluent-plugin-xml-parser).
   - Default time_key field for json format is 'time'
-- topic: Topic name to be subscribed
-- bulk_trans: Enable bulk transfer to support buffered output (mqtt_buf, Fluent::MqttBufferedOutput, defaut: true)
-- bulk_trans_sep: A message separator for bulk transfer. The default separator is "\t".
-- username: User name for authentication
-- password: Password for authentication
-- keep_alive: An interval of sending keep alive packet (default 15 sec)
-- ssl: set true if you want to use SSL/TLS. If set to true, the following parameter must be provided
-  - ca_file: CA certificate file path
-  - key_file: private key file path
-  - cert_file: certificate file path
-- recv_time: Add receive time to message in millisecond (ms) as integer for debug and performance/delay analysis
-- recv_time_key: An attribute of recv_time
+- **topic**: Topic name to be subscribed
+- **bulk_trans**: Enable bulk transfer to support buffered output (mqtt_buf, Fluent::MqttBufferedOutput, defaut: true)
+- **bulk_trans_sep**: A message separator for bulk transfer. The default separator is "\t".
+- **username**: User name for authentication
+- **password**: Password for authentication
+- **keep_alive**: An interval of sending keep alive packet (default 15 sec)
+- **ssl**: set true if you want to use SSL/TLS. If set to true, the following parameter must be provided
+  - **ca_file**: CA certificate file path
+  - **key_file**: private key file path
+  - **cert_file**: certificate file path
+- **recv_time**: Add receive time to message in millisecond (ms) as integer for debug and performance/delay analysis
+- **recv_time_key**: An attribute of recv_time
+- **initial_interval**: An initial value of retry interval (s) (default 1)
+- **retry_inc_ratio**: An increase ratio of retry interval per connection failure (default 2 (double)). It may be better to set the value to 1 in a mobile environment for eager reconnection.
 
 Input Plugin supports @label directive.
 

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.2.2"
+  spec.version       = "0.2.3"
   spec.authors       = ["Toyokazu Akiyama"]
   spec.email         = ["toyokazu@gmail.com"]
 

data/lib/fluent/plugin/in_mqtt.rb

@@ -17,6 +17,8 @@ module Fluent
     config_param :cert_file, :string, :default => nil
     config_param :recv_time, :bool, :default => false
     config_param :recv_time_key, :string, :default => "recv_time"
+    config_param :initial_interval, :integer, :default => 1
+    config_param :retry_inc_ratio, :integer, :default => 2
 
     require 'mqtt'
 
@@ -37,11 +39,11 @@ module Fluent
     end
     
     def init_retry_interval
-      @retry_interval = 1
+      @retry_interval = @initial_interval
     end
 
     def increment_retry_interval
-      @retry_interval = @retry_interval * 2
+      @retry_interval = @retry_interval * @retry_inc_ratio
     end
 
     def sleep_retry_interval(e, message)

data/lib/fluent/plugin/mqtt_output_mixin.rb

@@ -20,6 +20,8 @@ module Fluent
       base.config_param :bulk_trans_sep, :string, :default => "\t"
       base.config_param :send_time, :bool, :default => false
       base.config_param :send_time_key, :string, :default => "send_time"
+      base.config_param :initial_interval, :integer, :default => 1
+      base.config_param :retry_inc_ratio, :integer, :default => 2
     end
 
     require 'mqtt'
@@ -33,11 +35,11 @@ module Fluent
     end
 
     def init_retry_interval
-      @retry_interval = 1
+      @retry_interval = @initial_interval
     end
 
     def increment_retry_interval
-      @retry_interval = @retry_interval * 2
+      @retry_interval = @retry_interval * @retry_inc_ratio
     end
 
     def sleep_retry_interval(e, message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mqtt-io
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: []
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -105,10 +105,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: fluentd input/output plugin for mqtt broker
 test_files:
 - test/helper.rb
-has_rdoc: