fluent-plugin-mqtt-io 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de59247eae560befc4d28b446d68e3e9ef650e90
-  data.tar.gz: 6e9eb9e006557bdad477407ec7d648bacf73d9ce
+  metadata.gz: 37e8d6d8654a36f64c79820fbad23be5ae0ddebb
+  data.tar.gz: e9948422c7a870dcc6fae0d823ffb11c7c57015e
 SHA512:
-  metadata.gz: f96037a4572be86d1acf889569d41f814dfc13270eda73dbb7b704c2de05e8ad83723c3648d90e1f530a443ea52bd189f88e861982ed376e67d320964fef5afd
-  data.tar.gz: 18a41fef17638a172e500df27aa51b45da20e3ef022823893f358d26ed581bdae5d86af4e1bb0568ffb2054da1fc108051123b93d4010b46980f31905ff552a3
+  metadata.gz: 374d8bdcd8ac17ef363f68808211948071d8b8eaedb9e0c0d93ad878a44d358793b9ae95512bcf1ed64bf1acb421fb70740428c39ca66127383b9aad09a2bb45
+  data.tar.gz: 2b0d5bddcf1184ffeeb1f630cd0c1caf5688d37b17187dd320d9104d03aa2b998b047dc5c1a1e45378d334120f327ea323e15a515c55536b5540a4e4c9bfa42d

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

data/lib/fluent/plugin/in_mqtt.rb

@@ -9,7 +9,7 @@ module Fluent::Plugin
 
     Fluent::Plugin.register_input('mqtt', self)
 
-    helpers :thread, :compat_parameters, :parser
+    helpers :compat_parameters, :parser
 
     desc 'The topic to subscribe.'
     config_param :topic, :string, default: '#'
@@ -59,14 +59,13 @@ module Fluent::Plugin
     def after_connection
       if @client.connected?
         @client.subscribe(@topic)
-        thread_create(:in_mqtt_get) do
-          rescue_disconnection do
-            @client.get do |topic, message|
-              emit(topic, message)
-            end
+        @get_thread = thread_create(:in_mqtt_get) do
+          @client.get do |topic, message|
+            emit(topic, message)
           end
         end
       end
+      @get_thread
     end
 
     def add_recv_time(record)

data/lib/fluent/plugin/mqtt_proxy.rb

@@ -4,7 +4,7 @@ module Fluent::Plugin
     MQTT_PORT = 1883
 
     def self.included(base)
-      base.helpers :timer
+      base.helpers :timer, :thread
 
       base.desc 'The address to connect to.'
       base.config_param :host, :string, default: '127.0.0.1'
@@ -63,7 +63,6 @@ module Fluent::Plugin
       end
 
       init_retry_interval
-      @client_mutex = Mutex.new
       @client = MQTT::Client.new(opts)
       connect
     end
@@ -113,17 +112,20 @@ module Fluent::Plugin
 
     def after_connection
       # should be implemented
+      # returns thread instance for monitor thread to wait
+      # for Exception raised by MQTT I/O
     end
 
     def connect
-      @client_mutex.lock
-      rescue_disconnection do
-        @client.connect
-        log.debug "connected to mqtt broker #{@host}:#{@port} for #{current_plugin_name}"
-        init_retry_interval
+      thread_create("#{current_plugin_name}_monitor".to_sym) do
+        rescue_disconnection do
+          @client.connect
+          log.debug "connected to mqtt broker #{@host}:#{@port} for #{current_plugin_name}"
+          init_retry_interval
+          thread = after_connection
+          thread.join
+        end
       end
-      @client_mutex.unlock
-      after_connection
     end
   end
 end

data/lib/fluent/plugin/out_mqtt.rb

@@ -60,6 +60,13 @@ module Fluent::Plugin
       super
     end
 
+    def after_connection
+      @dummy_thread = thread_create(:out_mqtt_dummy) do
+        Thread.stop
+      end
+      @dummy_thread
+    end
+
     def current_plugin_name
       :out_mqtt
     end

metadata

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