mqtt-sub_handler 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 18671e62878aafdf463e797c5e89da3ea1c20929
-  data.tar.gz: a3d320eb0eb210c1e5826d54e9b835a5cf9b7faf
+SHA256:
+  metadata.gz: 8d47218ce7ba4ae48cf8b7b44ecd807889111f520a86d5eaa5d458590d75ee5b
+  data.tar.gz: ba2fdf1f66a85f0de62c8c3b0238aa8ddf43df4a8e396440df92daf3323286ee
 SHA512:
-  metadata.gz: f4a469aa5608c1283ff0daf5e5946086b1ed249052aa12d1284264a450d12b6e30cc217241cd0b582002d7f5ae26c5ad4ff3a0a58b83d843b6765522b5155f11
-  data.tar.gz: f2fb74a355bdf2079381fec5278d76ebf7b55f38d339df0d14735041448b55bfbcadc8754d67fa5c9ea45c4af0fe08505ae79586b4f7cf1ea468aa6272d16d59
+  metadata.gz: 44c1ab1959a9d930ff9ffa18ee5f665d0ac76ae66da132c57dc12ccba36f7228b759d1b3eb24986b40160c2376569d33129ef127433a15f5f1aec6a3af5c4e2e
+  data.tar.gz: 609f907b547a2a78a08a2f2cdcf1f241cc2db70f8dc17c124682aac3423375f1f55399bfc2a376582fcd93fbc2fcf7d7648768d2bd14ad3c03878e5d671326c5

data/lib/mqtt/sub_handler.rb

@@ -68,7 +68,7 @@ class SubHandler
 			tMatch = SubHandler.getTopicMatch(topic, h.topic_split);
 			if tMatch
 				begin
-					Timeout.timeout(10) {
+					Timeout.timeout(5) {
 						h.offer(tMatch, data)
 					}
 				rescue Timeout::Error
@@ -84,19 +84,8 @@ class SubHandler
 
 	# Handle sending a subscription-message to the server
 	def raw_subscribe_to(topic, qos: 1)
-		begin
-			@conChangeMutex.lock
-			if not @connected
-				@subscribeQueue << [topic, qos];
-				@conChangeMutex.unlock
-			else
-				@conChangeMutex.unlock
-				@mqtt.subscribe(topic => qos);
-			end
-		rescue MQTT::Exception, SocketError, SystemCallError
-			sleep 0.05;
-			retry
-		end
+		@subscribeQueue << [topic, qos];
+		@publisherThread.run();
 	end
 	private :raw_subscribe_to
 
@@ -220,26 +209,8 @@ class SubHandler
 			data = data.to_json
 		end
 
-		retryCount = 0;
-		begin
-			@conChangeMutex.lock
-			if not @connected
-				@publishQueue << {topic: topic, data: data, qos: qos, retain: retain} unless qos == 0
-				@conChangeMutex.unlock
-			else
-				@conChangeMutex.unlock
-				@mqtt.publish(topic, data, retain);
-			end
-		rescue MQTT::Exception, SocketError, SystemCallError
-			retryCount += 1;
-			if(qos == 0 && retryCount == 3)
-				STDERR.puts "Publish to #{topic} dropped!"
-				return;
-			end
-
-			sleep 0.05;
-			retry
-		end
+		@publishQueue << {topic: topic, data: data, qos: qos, retain: retain}
+		@publisherThread.run();
 	end
 	alias publishTo publish_to
 
@@ -265,13 +236,13 @@ class SubHandler
 		if(@mqttWasStartedClean)
 			print "Logging out of mqtt server... "
 			begin
-			Timeout.timeout(10) {
+			Timeout.timeout(3) {
 				begin
 					@mqtt.clean_session = true;
 					@mqtt.disconnect();
 					@mqtt.connect();
 				rescue MQTT::Exception, SocketError, SystemCallError
-					sleep 1
+					sleep 0.3
 					retry;
 				end
 			}
@@ -284,35 +255,59 @@ class SubHandler
 	end
 	private :ensure_clean_exit
 
-	def mqtt_resub_thread
-		while(true)
+	def mqtt_push_thread
+		loop do
+			Thread.stop();
+
+			next unless @connected
+
 			begin
-				Timeout.timeout(10) {
-					@mqtt.connect()
-				}
-				@conChangeMutex.synchronize {
-					@connected = true;
-				}
 				until @subscribeQueue.empty? do
 					h = @subscribeQueue[-1];
-					@mqtt.subscribe(h[0] => h[1]);
+					Timeout.timeout(3) {
+						@mqtt.subscribe(h[0] => h[1]);
+					}
 					@subscribeQueue.pop;
 					sleep 0.01
 				end
 				until @publishQueue.empty? do
 					h = @publishQueue[-1];
-					@mqtt.publish(h[:topic], h[:data], h[:retain]);
+					Timeout.timeout(3) {
+						@mqtt.publish(h[:topic], h[:data], h[:retain], h[:qos]);
+					}
 					@publishQueue.pop;
 					sleep 0.01
 				end
+			rescue MQTT::Exception, SocketError, SystemCallError, Timeout::Error
+					@conChangeMutex.synchronize {
+						@connected = false;
+					}
+					@mqtt.disconnect();
+			end
+		end
+	end
+	private :mqtt_push_thread
+
+	def mqtt_resub_thread
+		while(true)
+			begin
+				Timeout.timeout(4) {
+					@mqtt.connect()
+				}
+				STDERR.puts("MQTT #{@mqtt.host} connected!")
+				@conChangeMutex.synchronize {
+					@connected = true;
+				}
+				@publisherThread.run();
 				@mqtt.get do |topic, message|
 					call_interested(topic, message);
 				end
 			rescue MQTT::Exception, Timeout::Error, SocketError, SystemCallError
+				STDERR.puts("MQTT #{@mqtt.host} disconnected!");
 				@connected = false;
 
 				@conChangeMutex.unlock if @conChangeMutex.owned?
-				@mqtt.clean_session=false;
+				@mqtt.clean_session = false;
 				sleep 2
 			end
 		end
@@ -331,10 +326,7 @@ class SubHandler
 		Thread.stop();
 	end
 	def flush_pubqueue()
-		puts "\n";
-		if @publishQueue.empty?
-			puts "MQTT buffer empty, continuing."
-		else
+		unless @publishQueue.empty?
 			print "Finishing sending of MQTT messages ... "
 			begin
 				Timeout.timeout(10) {
@@ -388,18 +380,17 @@ class SubHandler
 		end
 		@listenerThread.abort_on_exception = true;
 
+		@publisherThread = Thread.new do
+			mqtt_push_thread();
+		end
+		@publisherThread.abort_on_exception = true;
+
 		at_exit {
 			flush_pubqueue();
 			@listenerThread.kill();
+			@publisherThread.kill();
 			ensure_clean_exit();
 		}
-
-		begin
-		Timeout.timeout(10) {
-			until(@connected) do sleep 0.1; end
-		}
-		rescue Timeout::Error
-		end
 	end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sub_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Xasin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt
@@ -114,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Asynchronous, topic-based MQTT gem