mqtt-sub_handler 0.1.6.4 → 0.1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d3eef659ff2c5da99d386d05fc145c328d7eea5b2057d30fa7f1ec43bda7748c
-  data.tar.gz: 69559fc70301f60f25ea322731b936738eb7d55609a8c817fcedf161e3640590
+SHA1:
+  metadata.gz: 1b63292ef3dbfdfb64cd76e98da11ea6b23c916c
+  data.tar.gz: 1db5486954346b4f8e09bc807a95b4e578ceac77
 SHA512:
-  metadata.gz: 1693df3d20154bb9a283cd75f0f3f82411173c7716daa89f84c89a0497ef36fa92965827927baa32ec1ead5c6697e87f3270c10099b7fd3815695be06af730f0
-  data.tar.gz: cc4fab89804258ffdbec5d89a11a94426c264b2866f10780cfff4aab3422cb78ca031b784e0e0200b20815f3ffc27934740b9250c8a0ef1283779bcbc05a0206
+  metadata.gz: 527c14a9c9c9fd67c7d93607b5bed6ee7bf4b8f29145c52ff2829bb2fea903a2ca1fe089234c7471ce538b9d6513367042028fecb1fab7c397dfe43ddc960ec3
+  data.tar.gz: 1ac7f34fe0adeef751bddbc568fad12160eec2c71c4d449791b041091b4c1855429976d1942a327aa43bd9b513386c994c73e80e319e483f1dfbf786b6380220

data/lib/mqtt/base_handler.rb

@@ -62,10 +62,10 @@ module MQTT
 							h.offer(tMatch, data)
 						}
 					rescue Timeout::Error
-						x_logf("Timeout on callback #{h}");
+						x_loge("Timeout on callback #{h}");
 					rescue => e
 						x_logf("Uncaught error on #{h}");
-						x_logf(e);
+						x_logf(e.inspect);
 					end
 					topicHasReceivers = true;
 				end
@@ -82,7 +82,7 @@ module MQTT
 			@packetQueueMutex.synchronize {
 				@packetQueue << data;
 				if(@packetQueue.size == 999)
-					x_loge("Packet queue congested, dropping packets!");
+					x_logf("Packet queue congested, dropping packets!");
 				end
 				if(@packetQueue.size > 1000)
 					@packetQueue.shift
@@ -196,7 +196,7 @@ module MQTT
 					end
 				rescue MQTT::Exception, SocketError, SystemCallError, Timeout::Error => e
 						x_loge("Push error!");
-						x_loge(e.inspet);
+						x_loge(e.inspect);
 
 						sleep 0.5
 				end
@@ -218,6 +218,7 @@ module MQTT
 					x_logi("Connected!");
 					@conChangeMutex.synchronize {
 						@connected = true;
+						@reconnectCount = 0;
 					}
 
 					@packetQueueMutex.synchronize {
@@ -231,10 +232,11 @@ module MQTT
 				rescue MQTT::Exception, Timeout::Error, SocketError, SystemCallError
 					x_loge("Disconnected!") if @connected
 					@connected = false;
+					@reconnectCount += 1;
 
 					@conChangeMutex.unlock if @conChangeMutex.owned?
 					@mqtt.clean_session = false;
-					sleep 2
+					sleep [0.1, 0.5, 1, 1, 5, 5, 5, 10, 10, 10, 10][@reconnectCount] || 30;
 				end
 			end
 
@@ -242,18 +244,6 @@ module MQTT
 		end
 		private :mqtt_resub_thread
 
-		# Pause the main thread and wait for messages.
-		# This is mainly useful when the code has set everything up, but doesn't just want to end.
-		# "INT" is trapped, ensuring a smooth exit on Ctrl-C
-		def lockAndListen()
-			Signal.trap("INT") {
-				exit 0
-			}
-
-			puts "Main thread paused."
-			Thread.stop();
-		end
-
 		def destroy!()
 			return if @destroying
 			@destroying = true;
@@ -268,7 +258,7 @@ module MQTT
 						end
 					}
 				rescue Timeout::Error
-					x_logw "Publishes did not complete";
+					x_logw "Not all messages were published";
 				else
 					x_logd "Publish clean finished"
 				end
@@ -308,7 +298,8 @@ module MQTT
 			self.log_level = Logger::INFO;
 
 			@conChangeMutex = Mutex.new();
-			@connected 		= false;
+			@connected 		 = false;
+			@reconnectCount = 0;
 
 			@mqtt.client_id ||= MQTT::Client.generate_client_id("MQTT_Sub_", 8);
 

data/lib/mqtt/sub_handler.rb

@@ -124,6 +124,19 @@ class SubHandler < BaseHandler
 	end
 	alias publishTo publish_to
 
+	# Pause the main thread and wait for messages.
+	# This is mainly useful when the code has set everything up, but doesn't just want to end.
+	# "INT" is trapped, ensuring a smooth exit on Ctrl-C
+	def lockAndListen()
+		Signal.trap("INT") {
+			exit 0
+		}
+
+		x_logi("Main thread paused.")
+		Thread.stop();
+	end
+	alias lock_and_listen lockAndListen
+
 	def initialize(mqttClient, jsonify: true)
 		super(mqttClient);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sub_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.6.4
+  version: 0.1.6.5
 platform: ruby
 authors:
 - Xasin
@@ -129,7 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Asynchronous, topic-based MQTT gem