logstash-input-paho-mqtt 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8305817f372e5cb1bc4e67aa01f6e4b70c5d3d706a883012622774a42fd38ae1
-  data.tar.gz: f29106c4f90d9c4a7802ed19de9e10f57f6271e7d947b9534713757cd92d611c
+  metadata.gz: 6d749cd9742fb0b3e08e19e79c02da6dc5efa6b1e43ee126e9b9d3439393818a
+  data.tar.gz: de0e1558ce428a8db0bcec19452e474bf2e46bd356815df89982766e60146fb6
 SHA512:
-  metadata.gz: fab45a3ef1c8b3808a93af58b65c8d02e6fc5ee02838e9dae667b2e8b14fe987a005c38d9f8660cc9c1e2d324893942cd817cd23483c41f2d80881b5e0712c72
-  data.tar.gz: 0aaa45dee17ba825821093e9ebdf1a87fc8ab31b99e8651e3882123a96bb1cc2aad43759903b72fb1f7a8ede22ef151062df591393c2ab6fe41e2ce106bc1d2f
+  metadata.gz: 4a78a54c9d99168e432b1b2d57e3da9ac7133bf4cb2fe033daa7cbb127b5f12d7cf21ac085894b374e996f89909c6ac4187af338ceb11dbadc0e6bd068eebb16
+  data.tar.gz: e40d79b8744fa61b8ede849d2865955aadc210356b4b32afd1078cfa7536b0f9817ef7b14fb72385b30a393310b9ef4c9339cc94fd7449709373da12debe0a8b

data/lib/logstash/inputs/mqtt.rb

@@ -9,8 +9,6 @@ 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.
@@ -32,7 +30,7 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
 	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 :logfile, :validate => :string, :default => '/dev/stdout'
 	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
@@ -50,7 +48,7 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
 		#levels: DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
 		PahoMqtt.logger.level = @log_level unless @logfile.nil?
 
-		@client = RecoverableMqttClient.new({
+		@client = PahoMqtt::Client.new({
 			:host => @host,
 			:port => @port,
 			:persistent => @persistent, # keep connection persistent
@@ -64,8 +62,8 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
 			:will_payload => @will_payload,
 			:will_qos => @will_qos,
 			:will_retain => @will_retain,
-			:retry_reconnection_max_count => @reconnect_retries,
-      :retry_reconnection_sleep_time => @reconnect_sleep_time,
+			:reconnect_limit => @reconnect_retries,
+			:reconnect_delay => @reconnect_sleep_time,
 		})
 
 		if @ssl
@@ -91,7 +89,7 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
 		rescue PahoMqtt::Exception => e
 			@logger.warn("Error while setting up connection for MQTT broker! Retrying.",
 				:message => e.message,
- 				:class => e.class.name,
+				:class => e.class.name,
 				:location => e.backtrace.first
 			)
 			Stud.stoppable_sleep(1) { stop? }

data/logstash-input-mqtt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-paho-mqtt'
-  s.version       = '0.1.4'
+  s.version       = '0.1.5'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Logstash MQTT input plugin.'
   s.homepage      = 'https://github.com/jurek7/logstash-input-mqtt'
@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency 'logstash-codec-plain'
-  s.add_runtime_dependency 'paho-mqtt', '>= 1.0.5'
+  s.add_runtime_dependency 'paho-mqtt', '>= 1.0.12'
   s.add_development_dependency 'logstash-devutils', '>= 0.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-paho-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - juri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.12
   name: paho-mqtt
   prerelease: false
   type: :runtime
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.12
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -79,7 +79,6 @@ 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

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

@@ -1,53 +0,0 @@
-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