mqtt-sub_handler 0.1.6.6 → 0.1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ba341adcdf6af88c17d55b3d85c26636433d70a
-  data.tar.gz: 71da42b10aef17c6e18f76fd8ad58d82567ffc28
+  metadata.gz: 9be8cc94d063f20f4e602ca44c33e1f063fcd8db
+  data.tar.gz: b115b3aa01cdb8aceab2ba442d1e8748c25ce3e1
 SHA512:
-  metadata.gz: e13a27eecb49d53065c61984138522e21300af90c43e9abd2e89b79c07d98081069c4df78bbb32e2f3363f7e160b70c871ce65dafb4e7fe422462e5add584bcd
-  data.tar.gz: 76035229d908f29eacced39d530b1d963333e70b87f943039280f2af326d791aa81364c1889c301015827534ff956dcff490372075f8cfd485c75a705693ba51
+  metadata.gz: 18305fa0dbabdaea4762c0b53adec091bd0db67f06ef23aca414ab136ccc35e50c26641f5d21cd6d70554a6b213f87295b23ceaab1f07d9ff04f0e17fef53770
+  data.tar.gz: 8b1aa38aad47777c42538ef19d17db3cf9cd49259d177863664d8ae561406d0691a7e80b774e1f6dd5f6d09d8ce6c8bda7a23a933a2f68b593e29daf857aa7fe

data/lib/mqtt/base_handler.rb

@@ -161,7 +161,28 @@ module MQTT
 		end
 		private :ensure_clean_exit
 
+		def attempt_packet_publish()
+			until @packetQueue.empty? do
+				h = nil;
+				@packetQueueMutex.synchronize {
+					h = @packetQueue[0];
+				}
+				Timeout.timeout(3) {
+					if(h[:type] == :sub)
+						@mqtt.subscribe(h[:topic] => h[:qos]);
+					elsif(h[:type] == :pub)
+						@mqtt.publish(h[:topic], h[:data], h[:retain], h[:qos]);
+					end
+				}
+				@packetQueueMutex.synchronize {
+					@packetQueue.shift();
+				}
+			end
+		end
+
 		def mqtt_push_thread
+			@push_error_count = 0;
+
 			loop do
 				@packetQueueMutex.synchronize {
 					@publisherThreadWaiting = true;
@@ -177,27 +198,19 @@ module MQTT
 				next unless @connected
 
 				begin
-					until @packetQueue.empty? do
-						h = nil;
-						@packetQueueMutex.synchronize {
-							h = @packetQueue[0];
-						}
-						Timeout.timeout(3) {
-							if(h[:type] == :sub)
-								@mqtt.subscribe(h[:topic] => h[:qos]);
-							elsif(h[:type] == :pub)
-								@mqtt.publish(h[:topic], h[:data], h[:retain], h[:qos]);
-							end
-						}
-						@packetQueueMutex.synchronize {
-							@packetQueue.shift();
-						}
-					end
+					attempt_packet_publish();
 				rescue MQTT::Exception, SocketError, SystemCallError, Timeout::Error => e
-						x_loge("Push error!");
-						x_loge(e.inspect);
+					x_loge("Push error!");
+					x_loge(e.inspect);
 
-						sleep 0.5
+					@push_error_count += 1;
+					if(@push_error_count >= 10)
+						@mqtt.disconnect();
+					end
+
+					sleep 0.5
+				else
+					@push_error_count = 0;
 				end
 			end
 
@@ -284,11 +297,13 @@ module MQTT
 		# @example Starting the handler
 		#  mqtt = MQTT::SubHandler.new('mqtt.eclipse.org');
 		#  mqtt = MQTT::SubHandler.new(MQTT::Client.new("Your.Client.Opts"))
-		def initialize(mqttClient, logger: nil)
+		def initialize(mqttClient, logger: nil, **extra_opts)
 			@callbackList = Array.new();
 			if mqttClient.is_a? String
 				@mqtt = MQTT::Client.new(mqttClient);
 				@mqtt.clean_session = false;
+
+				@mqttWasStartedClean = true if extra_opts[:client_id].nil?
 			else
 				@mqtt = mqttClient;
 			end
@@ -300,7 +315,7 @@ module MQTT
 			@connected 		 = false;
 			@reconnectCount = 0;
 
-			@mqtt.client_id ||= MQTT::Client.generate_client_id("MQTT_Sub_", 8);
+			@mqtt.client_id ||= extra_opts[:client_id] || MQTT::Client.generate_client_id("MQTT_Sub_", 8);
 
 			@packetQueue = Array.new();
 			@packetQueueMutex = Mutex.new();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sub_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.6.6
+  version: 0.1.6.8
 platform: ruby
 authors:
 - Xasin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt
@@ -28,16 +28,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: xasin-logger
   requirement: !ruby/object:Gem::Requirement