logstash-input-paho-mqtt 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5f443be5b40801a3161859fd21cab2da0d1aee25cc9920e88b089557ebfbb02
-  data.tar.gz: 70935c7156dd45eff262f348b6a33a3b43cfd467c1167f45d61ed568ac24abf6
+  metadata.gz: 8305817f372e5cb1bc4e67aa01f6e4b70c5d3d706a883012622774a42fd38ae1
+  data.tar.gz: f29106c4f90d9c4a7802ed19de9e10f57f6271e7d947b9534713757cd92d611c
 SHA512:
-  metadata.gz: 49c7b59d703159109010808c00865b991a2c8aff9b90c68b80b66ffe1c15b643e9989d40c7eec6e1641010a3fc0d9c64d5493d955b48a75816bbb594e1c4c9ee
-  data.tar.gz: 32e042f8010e798d239b06997c5ba061c461a5e2862020718b207be2acf29d52be303930becec86b127dc0f0bb3d46f539a073cb257e9169e7a20e2387835c12
+  metadata.gz: fab45a3ef1c8b3808a93af58b65c8d02e6fc5ee02838e9dae667b2e8b14fe987a005c38d9f8660cc9c1e2d324893942cd817cd23483c41f2d80881b5e0712c72
+  data.tar.gz: 0aaa45dee17ba825821093e9ebdf1a87fc8ab31b99e8651e3882123a96bb1cc2aad43759903b72fb1f7a8ede22ef151062df591393c2ab6fe41e2ce106bc1d2f

data/lib/logstash/inputs/mqtt.rb

@@ -9,6 +9,8 @@ require 'paho-mqtt'
 # This plugin is intented only as an example.
 
 class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
+  require "logstash/inputs/mqtt/logstash_mqtt"
+
 	config_name 'mqtt'
 
 	# If undefined, Logstash will complain, even if codec is unused.
@@ -29,6 +31,14 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
 	config :will_payload, :validate => :string, :default => ''
 	config :will_qos, :validate => :string, :default => 0
 	config :will_retain, :validate => :boolean, :default => false
+	config :persistent, :validate => :boolean, :default => true
+	config :logfile, :validate => :string, :default => nil
+	config :log_level, :validate => :string, :default => 'ERROR' 
+	config :reconnect_retries, :validate => :number, :default => -1 #-1 infinite loop
+	config :reconnect_sleep_time, :validate => :number, :default => 5
+	config :certificate_path, :validate => :string, :default => nil
+	config :key_path, :validate => :string, :default => nil
+	config :root_ca_path, :validate => :string, :default => nil
 
 	public
 	def register
@@ -36,10 +46,14 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
 	end # def register
 
 	def run(queue)
-		@client = PahoMqtt::Client.new({
+		PahoMqtt.logger = @logfile unless @logfile.nil?
+		#levels: DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+		PahoMqtt.logger.level = @log_level unless @logfile.nil?
+
+		@client = RecoverableMqttClient.new({
 			:host => @host,
 			:port => @port,
-			:persistent => true, # keep connection persistent
+			:persistent => @persistent, # keep connection persistent
 			:mqtt_version => @mqtt_version,
 			:clean_session => @clean_session,
 			:client_id => @client_id,
@@ -49,20 +63,31 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
 			:will_topic => @will_topic,
 			:will_payload => @will_payload,
 			:will_qos => @will_qos,
-			:will_retain => @will_retain
+			:will_retain => @will_retain,
+			:retry_reconnection_max_count => @reconnect_retries,
+      :retry_reconnection_sleep_time => @reconnect_sleep_time,
 		})
+
+		if @ssl
+			@client.config_ssl_context(@certificate_path, @key_path, @root_ca_path)
+		end
+
 		@client.on_message do |message|
 			@codec.decode(message.payload) do |event|
 				host = event.get("host") || @logstash_host
 				event.set("host", host)
+				event.set("topic", message.topic)
 
 				decorate(event)
 				queue << event
 			end
 		end
 		
+		is_connected = false
+
 		begin
 			@client.connect
+			is_connected = true
 		rescue PahoMqtt::Exception => e
 			@logger.warn("Error while setting up connection for MQTT broker! Retrying.",
 				:message => e.message,
@@ -73,10 +98,12 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
 			retry
 		end
 
-		# subscribe to topic
-		@client.subscribe([@topic, @qos])
+		if is_connected
+			# subscribe to topic
+			@client.subscribe([@topic, @qos])
 
-		Stud.stoppable_sleep(1) { stop? } while !stop?
+			Stud.stoppable_sleep(1) { stop? } while !stop?
+		end
 	end # def run
 
 end # class LogStash::Inputs::Mqtt

data/lib/logstash/inputs/mqtt/logstash_mqtt.rb

@@ -0,0 +1,53 @@
+require "paho-mqtt"
+require "logger"
+
+module LogStash
+  module Inputs
+    class Mqtt
+      class RecoverableMqttClient < PahoMqtt::Client
+      
+        attr_accessor :retry_reconnection_max_count
+        attr_accessor :retry_reconnection_sleep_time
+        
+        def initialize(*args)
+          @retry_reconnection_max_count = 3
+          @retry_reconnection_sleep_time = 5
+          @stop_connection = false
+          super(*args)
+        end
+    
+        def reconnect
+          @reconnect_thread = Thread.new do
+            retries = @retry_reconnection_max_count
+            while retries != 0 do
+              retries -= 1 unless retry_reconnection_max_count < 0
+              if @stop
+                PahoMqtt.logger.warn("RecoverableClient::Reconnection attempt is over due to stop request.") if PahoMqtt.logger?
+                disconnect(false)
+                exit(1)
+                break
+              end
+              PahoMqtt.logger.debug("RecoverableClient::New reconnect attempt...remaining retries #{retries}") if PahoMqtt.logger?
+              connect
+              if connected?
+                break
+              else
+                sleep @retry_reconnection_sleep_time
+              end
+            end
+            unless connected?
+              PahoMqtt.logger.error("RecoverableClient::Reconnection attempt counter is over.(#{@retry_reconnection_max_count} times)") if PahoMqtt.logger?
+              disconnect(false)
+              exit(1)
+            end
+            
+          end
+        end
+    
+        def stop
+          @stop_connection = true
+        end
+      end #class RecoverableMqttClient
+    end #class Mqtt
+  end #module Inputs
+end #module LogStash

data/logstash-input-mqtt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-paho-mqtt'
-  s.version       = '0.1.2'
+  s.version       = '0.1.4'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Logstash MQTT input plugin.'
   s.homepage      = 'https://github.com/jurek7/logstash-input-mqtt'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-paho-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - juri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,7 @@ files:
 - LICENSE
 - README.md
 - lib/logstash/inputs/mqtt.rb
+- lib/logstash/inputs/mqtt/logstash_mqtt.rb
 - logstash-input-mqtt.gemspec
 - spec/inputs/mqtt_spec.rb
 homepage: https://github.com/jurek7/logstash-input-mqtt