mqtt-sub_handler 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d47218ce7ba4ae48cf8b7b44ecd807889111f520a86d5eaa5d458590d75ee5b
-  data.tar.gz: ba2fdf1f66a85f0de62c8c3b0238aa8ddf43df4a8e396440df92daf3323286ee
+  metadata.gz: 22d57768280da99134fc12c1ab6d07b441df823f59992d88411a1bc8b88cfe16
+  data.tar.gz: 34ead01f1186b52591969071404c2812badd339e17a404178b44295d6d6ed8e8
 SHA512:
-  metadata.gz: 44c1ab1959a9d930ff9ffa18ee5f665d0ac76ae66da132c57dc12ccba36f7228b759d1b3eb24986b40160c2376569d33129ef127433a15f5f1aec6a3af5c4e2e
-  data.tar.gz: 609f907b547a2a78a08a2f2cdcf1f241cc2db70f8dc17c124682aac3423375f1f55399bfc2a376582fcd93fbc2fcf7d7648768d2bd14ad3c03878e5d671326c5
+  metadata.gz: 11569eef332d8d8c186b6c246bfd32bea0643270152e27c06b1e92e560c93a091809a2994c3424fd36ed9e0d2898defcc8f45e7e57da3879a276e837d6e2b663
+  data.tar.gz: a1d962a3af87a942f45af28540b5902903cf0e37a569d7b174793dd471183c8337fc95f1bd4f0a06a9b9997cb04da78e60ed663be399968bddced5e641ad0aad

data/lib/mqtt/sub_handler.rb

@@ -3,6 +3,8 @@ require 'timeout'
 require 'mqtt'
 require 'json'
 
+require 'colorize'
+
 require_relative 'subscription_classes.rb'
 
 # @author Xasin
@@ -294,7 +296,7 @@ class SubHandler
 				Timeout.timeout(4) {
 					@mqtt.connect()
 				}
-				STDERR.puts("MQTT #{@mqtt.host} connected!")
+				STDERR.puts("MQTT: #{@mqtt.host} connected!".green)
 				@conChangeMutex.synchronize {
 					@connected = true;
 				}
@@ -303,7 +305,7 @@ class SubHandler
 					call_interested(topic, message);
 				end
 			rescue MQTT::Exception, Timeout::Error, SocketError, SystemCallError
-				STDERR.puts("MQTT #{@mqtt.host} disconnected!");
+				STDERR.puts("MQTT #{@mqtt.host} disconnected!".red);
 				@connected = false;
 
 				@conChangeMutex.unlock if @conChangeMutex.owned?
@@ -329,7 +331,7 @@ class SubHandler
 		unless @publishQueue.empty?
 			print "Finishing sending of MQTT messages ... "
 			begin
-				Timeout.timeout(10) {
+				Timeout.timeout(4) {
 					until @publishQueue.empty? do
 						sleep 0.05;
 					end
@@ -385,6 +387,16 @@ class SubHandler
 		end
 		@publisherThread.abort_on_exception = true;
 
+		begin
+			Timeout.timeout(3) {
+				until(@connected)
+					sleep 0.1;
+				end
+			}
+		rescue Timeout::Error
+			STDERR.puts "MQTT: #{@mqtt.host} did not connect!".red
+		end
+
 		at_exit {
 			flush_pubqueue();
 			@listenerThread.kill();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sub_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Xasin
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement