paho-mqtt 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59165a42d0455ead88b2d98f90ffded161270bd5
-  data.tar.gz: 4b1518662800f85b79bc02ed79d694ec4c8d1d60
+  metadata.gz: 80ab469d38120ae2f9cdcb6901ecc3f82e31cdca
+  data.tar.gz: 2ac290819f952a35d16708d78105acac6edd10dd
 SHA512:
-  metadata.gz: da53418b2eca67e6815ca89f1923c14eb205eaad902026becb715a3910b56718a1d75c0d89db4f4f92ec126d726844a02eb45f70385ada6b9c3981c9bb97c95b
-  data.tar.gz: e96111e7f79286a660a90932f56bdf273d548816e93eb4df423103530990552b0eb3c1e6f6a6fd10f5cb247c4135d0238a2bc2f459ae8800cb9a959491e2a1f9
+  metadata.gz: 022c3db947547fd72a9b7cdba15a1c60d5a0412ffed0e31bfca54e934178ba1a0d30935b9bba49402959bf9a91ff9c3e2dc3ceff51fb3806ed657e1c3e90240b
+  data.tar.gz: 22712df65d41429e9c16d3f34ebf4130af07c2b026f7ab4a6eadc8712181844d358c6030c529ec18ac363e41ee9fa4268019bab60a7615ff1737085c8df76293

data/lib/paho-mqtt.rb

@@ -104,6 +104,7 @@ module PahoMqtt
 
   def logger=(logger_path)
     file = File.open(logger_path, "a+")
+    file.sync = true
     log_file = Logger.new(file)
     log_file.level = Logger::DEBUG
     @logger = log_file

data/lib/paho_mqtt/client.rb

@@ -111,18 +111,28 @@ module PahoMqtt
       @connection_helper.send_connect(session_params)
       begin
         @connection_state = @connection_helper.do_connect(reconnect?)
+        if connected?
+          build_pubsub
+          daemon_mode unless @blocking
+        end
       rescue LowVersionException
         downgrade_version
       end
-      build_pubsub
-      daemon_mode unless @blocking || !connected?
     end
 
     def daemon_mode
       @mqtt_thread = Thread.new do
         @reconnect_thread.kill unless @reconnect_thread.nil? || !@reconnect_thread.alive?
-        while connected? do
-          mqtt_loop
+        begin
+          while connected? do
+            mqtt_loop
+          end
+        rescue SystemCallError => e
+          if @persistent
+            reconnect()
+          else
+            raise e
+          end
         end
       end
     end
@@ -176,21 +186,20 @@ module PahoMqtt
       @subscriber.check_waiting_subscriber
     end
 
-    def reconnect(retry_time=RECONNECT_RETRY_TIME, retry_tempo=RECONNECT_RETRY_TEMPO)
+    def reconnect
       @reconnect_thread = Thread.new do
-        retry_time.times do
+        RECONNECT_RETRY_TIME.times do
           PahoMqtt.logger.debug("New reconnect atempt...") if PahoMqtt.logger?
           connect
           if connected?
             break
           else
-            sleep retry_tempo
+            sleep RECONNECT_RETRY_TIME
           end
         end
         unless connected?
           PahoMqtt.logger.error("Reconnection atempt counter is over.(#{RECONNECT_RETRY_TIME} times)") if PahoMqtt.logger?
           disconnect(false)
-          exit
         end
       end
     end

data/lib/paho_mqtt/connection_helper.rb

@@ -35,6 +35,7 @@ module PahoMqtt
     end
 
     def do_connect(reconnection=false)
+      @cs = MQTT_CS_NEW
       @handler.socket = @socket
       # Waiting a Connack packet for "ack_timeout" second from the remote
       connect_timeout = Time.now + @ack_timeout

data/lib/paho_mqtt/version.rb

@@ -1,3 +1,3 @@
 module PahoMqtt
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/samples/{client_blocking.rb → client_blocking(reading).rb}

@@ -1,11 +1,7 @@
 require 'paho-mqtt'
-require 'logger'
 
-file = File.open('paho.log', "a+")
-log = Logger.new(file)
-log.level = Logger::DEBUG
-
-client = PahoMqtt::Client.new({logger: log})
+client = PahoMqtt::Client.new()
+PahoMqtt.logger = 'paho.log'
 
 client.on_message do |pck|
   puts "New Message: #{pck.topic}\n>>> #{pck.payload}"

data/samples/getting_started.rb

@@ -2,7 +2,7 @@ require 'paho-mqtt'
 
 ### Create a simple client with default attributes
 client = PahoMqtt::Client.new
-
+PahoMqtt.logger = 'paho_mqtt'
 ### Register a callback on message event to display messages
 message_counter = 0
 client.on_message do |message|  

data/samples/test_client.rb

@@ -2,7 +2,7 @@ require "paho-mqtt"
 require "logger"
 
 cli = PahoMqtt::Client.new({persistent: true, keep_alive: 7})
-PahoMqtt.logger = ('paho_log')
+PahoMqtt.logger = 'paho_log'
 
 cli.connect('localhost', 1883)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paho-mqtt
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Pierre Goudet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,8 +94,8 @@ files:
 - lib/paho_mqtt/subscriber.rb
 - lib/paho_mqtt/version.rb
 - paho-mqtt.gemspec
+- samples/client_blocking(reading).rb
 - samples/client_blocking(writing).rb
-- samples/client_blocking.rb
 - samples/getting_started.rb
 - samples/test_client.rb
 homepage: https://github.com/RubyDevInc/paho.mqtt.ruby