mqtt-rails 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07387e175ea1e3133f15fb9bce534aab019799ebb6472bbe7d48479cb67b9405'
-  data.tar.gz: '0438ddc874e70a232032e23a461081e798d4528191fb821523abd8f5d9a586fb'
+  metadata.gz: 7d42bae3dac21cb4e7667e5595f569d7b747904e64a9afb5355063d392b9743d
+  data.tar.gz: a8e8d27717146552022024cf378a914e6d86c22687018373d779533dab72efae
 SHA512:
-  metadata.gz: d83640e2f6fff6190fe3ab6232d1ab2fc6a6401c4d05cadb17cc6ad9304ea40cf7d80911ae018ddc749cba5436d8566d4278fe755651bd6d239dba6b2eaf44e3
-  data.tar.gz: f70787d2ebfa9bb889c7ec8b50103cc0b429e6cf1b736c9aee3290e6d0b0786e96d448cf8fa59896466051915f4ae32f72ee69614d0118dca73c2e9f0a862fd9
+  metadata.gz: 489468202873f5c0b78489a457b665e8eb0e0c72a33d46c6d3226120a3d95ba4b488ea69dfeff33765875f4d50bbc94a7b5e4b14417caf02aee3a6c7fe9a1887
+  data.tar.gz: 796b487d836396bca8d49518f496d356561d42382a204a4832710eaa670f9c63e702878c76d4362041bd7cf9e70ee3801fb22d94745bad2e436eaad864dd271b

data/lib/mqtt-rails.rb

@@ -137,7 +137,7 @@ module MqttRails
   def check_topics(topics, filters)
     if topics.is_a?(String) && filters.is_a?(String)
     else
-      Rails.logger.error("Topics or Wildcards are not found as String.")
+      Rails.logger.error("[MQTT RAILS][ERROR] Topics or Wildcards are not found as String.")
       raise ArgumentError
     end
   end

data/lib/mqtt_rails/client.rb

@@ -169,7 +169,7 @@ module MqttRails
           break if result.nil?
         end
       rescue FullQueueException
-        Rails.logger.warn("Early exit in reading loop. The maximum packets have been reach for #{packet.type_name}")
+        Rails.logger.warn("[MQTT RAILS][WARNING] Early exit in reading loop. The maximum packets have been reach for #{packet.type_name}")
       rescue ReadingException
         if check_persistence
           reconnect
@@ -199,7 +199,7 @@ module MqttRails
         counter = 0
         while (@reconnect_limit >= counter || @reconnect_limit == -1) do
           counter += 1
-          Rails.logger.info("New reconnect attempt...")
+          Rails.logger.info("[MQTT RAILS][INFO] New reconnect attempt...")
           connect
           if connected?
             break
@@ -208,7 +208,7 @@ module MqttRails
           end
         end
         unless connected?
-          Rails.logger.error("Reconnection attempt counter is over. (#{@reconnect_limit} times)")
+          Rails.logger.error("[MQTT RAILS][ERROR] Reconnection attempt counter is over. (#{@reconnect_limit} times)")
           disconnect(false)
         end
       end
@@ -228,7 +228,7 @@ module MqttRails
 
     def publish(topic, payload="", retain=false, qos=0)
       if topic == "" || !topic.is_a?(String)
-        Rails.logger.error("Publish topics is invalid, not a string or empty.")
+        Rails.logger.error("[MQTT RAILS][ERROR] Publish topics is invalid, not a string or empty.")
         raise ArgumentError
       end
       id = next_packet_id
@@ -243,7 +243,7 @@ module MqttRails
         end
         MQTT_ERR_SUCCESS
       rescue ProtocolViolation
-        Rails.logger.error("Subscribe topics need one topic or a list of topics.")
+        Rails.logger.error("[MQTT RAILS][ERROR] Subscribe topics need one topic or a list of topics.")
         raise ProtocolViolation
       end
     end
@@ -256,7 +256,7 @@ module MqttRails
         end
         MQTT_ERR_SUCCESS
       rescue ProtocolViolation
-        Rails.logger.error("Unsubscribe need at least one topic.")
+        Rails.logger.error("[MQTT RAILS][ERROR] Unsubscribe need at least one topic.")
         raise ProtocolViolation
       end
     end
@@ -364,7 +364,7 @@ module MqttRails
     end
 
     def downgrade_version
-      Rails.logger.info("Connection refused: unacceptable protocol version #{@mqtt_version}, trying 3.1")
+      Rails.logger.info("[MQTT RAILS][INFO] Connection refused: unacceptable protocol version #{@mqtt_version}, trying 3.1")
       if @mqtt_version != "3.1"
         @mqtt_version = "3.1"
         connect(@host, @port, @keep_alive)

data/lib/mqtt_rails/connection_helper.rb

@@ -43,7 +43,7 @@ module MqttRails
         @cs = @handler.receive_packet
       end
       unless is_connected?
-        Rails.logger.warn("Connection failed. Couldn't recieve a Connack packet from: #{@host}.")
+        Rails.logger.error("[MQTT RAILS][ERROR] Connection failed. Couldn't recieve a Connack packet from: #{@host}.")
         raise Exception.new("Connection failed. Check log for more details.") unless reconnection
       end
       @cs
@@ -54,7 +54,7 @@ module MqttRails
     end
 
     def do_disconnect(publisher, explicit, mqtt_thread)
-      Rails.logger.info("Disconnecting from #{@host}.")
+      Rails.logger.info("[MQTT RAILS][INFO] Disconnecting from #{@host}.")
       if explicit
         explicit_disconnect(publisher, mqtt_thread)
       end
@@ -78,7 +78,7 @@ module MqttRails
     end
 
     def config_socket
-      Rails.logger.info("Attempt to connect to host: #{@host}...")
+      Rails.logger.info("[MQTT RAILS][INFO] Attempt to connect to host: #{@host}...")
       begin
         tcp_socket = TCPSocket.new(@host, @port)
         if @ssl
@@ -87,7 +87,7 @@ module MqttRails
           @socket = tcp_socket
         end
       rescue StandardError
-        Rails.logger.warn("Could not open a socket with #{@host} on port #{@port}.")
+        Rails.logger.warn("[MQTT RAILS][WARNING] Could not open a socket with #{@host} on port #{@port}.")
       end
     end
 
@@ -97,7 +97,7 @@ module MqttRails
         @socket.sync_close = true
         @socket.connect
       else
-        Rails.logger.error("The SSL context was found as nil while the socket's opening.")
+        Rails.logger.error("[MQTT RAILS][ERROR] The SSL context was found as nil while the socket's opening.")
         raise Exception
       end
     end
@@ -113,7 +113,7 @@ module MqttRails
 
     def host=(host)
       if host.nil? || host == ""
-        Rails.logger.error("The host was found as nil while the connection setup.")
+        Rails.logger.error("[MQTT RAILS][ERROR] The host was found as nil while the connection setup.")
         raise ArgumentError
       else
         @host = host
@@ -122,7 +122,7 @@ module MqttRails
 
     def port=(port)
       if port.to_i <= 0
-        Rails.logger.error("The port value is invalid (<= 0). Could not setup the connection.")
+        Rails.logger.error("[MQTT RAILS][ERROR] The port value is invalid (<= 0). Could not setup the connection.")
         raise ArgumentError
       else
         @port = port
@@ -158,12 +158,12 @@ module MqttRails
       last_packet_received_at = @handler.last_packet_received_at
       # send a PINGREQ only if we don't already wait for a PINGRESP
       if persistent && should_send_ping?(now, keep_alive, last_packet_received_at)
-        Rails.logger.info("Checking if server is still alive...")
+        Rails.logger.info("[MQTT RAILS][INFO] Checking if server is still alive...")
         @sender.send_pingreq
       end
       disconnect_timeout_at = last_packet_received_at + (keep_alive * 1.1).ceil
       if disconnect_timeout_at <= now
-        Rails.logger.info("No activity is over timeout, disconnecting from #{@host}.")
+        Rails.logger.info("[MQTT RAILS][INFO] No activity is over timeout, disconnecting from #{@host}.")
         @cs = MQTT_CS_DISCONNECT
       end
       @cs

data/lib/mqtt_rails/handler.rb

@@ -52,14 +52,14 @@ module MqttRails
     end
 
     def handle_packet(packet)
-      Rails.logger.info("New packet #{packet.class} received.")
+      Rails.logger.info("[MQTT RAILS][INFO] New packet #{packet.class} received.")
       type = packet_type(packet)
       self.send("handle_#{type}", packet)
     end
 
     def register_topic_callback(topic, callback, &block)
       if topic.nil?
-        Rails.logger.error("The topics where the callback is trying to be registered have been found nil.")
+        Rails.logger.error("[MQTT RAILS][ERROR] The topics where the callback is trying to be registered have been found nil.")
         raise ArgumentError
       end
       clear_topic_callback(topic)
@@ -73,7 +73,7 @@ module MqttRails
 
     def clear_topic_callback(topic)
       if topic.nil?
-        Rails.logger.error("The topics where the callback is trying to be unregistered have been found nil.")
+        Rails.logger.error("[MQTT RAILS][ERROR] The topics where the callback is trying to be unregistered have been found nil.")
         raise ArgumentError
       end
       @registered_callback.delete_if { |pair| pair.first == topic }
@@ -101,19 +101,19 @@ module MqttRails
 
     def new_session?(session_flag)
       if !@clean_session && !session_flag
-        Rails.logger.info("New session created for the client.")
+        Rails.logger.info("[MQTT RAILS][INFO] New session created for the client.")
       end
     end
 
     def clean_session?(session_flag)
       if @clean_session && !session_flag
-        Rails.logger.info("No previous session found by server, starting a new one.")
+        Rails.logger.info("[MQTT RAILS][INFO] No previous session found by server, starting a new one.")
       end
     end
 
     def old_session?(session_flag)
       if !@clean_session && session_flag
-        Rails.logger.info("Previous session restored by the server.")
+        Rails.logger.info("[MQTT RAILS][INFO] Previous session restored by the server.")
       end
     end
 
@@ -254,7 +254,7 @@ module MqttRails
       if MqttRails::PACKET_TYPES[3..13].include?(type)
         type.to_s.split('::').last.downcase
       else
-        Rails.logger.error("Received an unexpeceted packet: #{packet}.")
+        Rails.logger.error("[MQTT RAILS][ERROR] Received an unexpeceted packet: #{packet}.")
         raise PacketException.new('Invalid packet type id')
       end
     end

data/lib/mqtt_rails/publisher.rb

@@ -47,7 +47,7 @@ module MqttRails
           push_queue(@waiting_pubrec, @pubrec_mutex, MAX_QUEUE, packet, new_id)
         end
       rescue FullQueueException
-        Rails.logger.warn("PUBLISH queue is full, waiting for publishing #{packet.inspect}")
+        Rails.logger.warn("[MQTT RAILS][WARNING] PUBLISH queue is full, waiting for publishing #{packet.inspect}")
         sleep SELECT_TIMEOUT
         retry
       end
@@ -73,7 +73,7 @@ module MqttRails
       when 2
         send_pubrec(packet_id)
       else
-        Rails.logger.error("The packet QoS value is invalid in publish.")
+        Rails.logger.error("[MQTT RAILS][ERROR] The packet QoS value is invalid in publish.")
         raise PacketException.new('Invalid publish QoS value')
       end
       MQTT_ERR_SUCCESS

data/lib/mqtt_rails/sender.rb

@@ -58,7 +58,7 @@ module MqttRails
           queue.push(packet)
         end
       else
-        Rails.logger.error('Writing queue is full, slowing down')
+        Rails.logger.error('[MQTT RAILS][ERROR] Writing queue is full, slowing down')
         raise FullWritingException
       end
     end
@@ -118,7 +118,7 @@ module MqttRails
         queue.each do |pck|
           if now >= pck[:timestamp] + @ack_timeout
             pck[:packet].dup ||= true unless pck[:packet].class == MqttRails::Packet::Subscribe || pck[:packet].class == MqttRails::Packet::Unsubscribe
-            Rails.logger.info("Acknowledgement timeout is over, resending #{pck[:packet].inspect}")
+            Rails.logger.info("[MQTT RAILS][INFO] Acknowledgement timeout is over, resending #{pck[:packet].inspect}")
             send_packet(pck[:packet])
             pck[:timestamp] = now
           end

data/lib/mqtt_rails/subscriber.rb

@@ -42,7 +42,7 @@ module MqttRails
         end
         @suback_mutex.synchronize do
           if @waiting_suback.length >= MAX_SUBACK
-            Rails.logger.error('SUBACK queue is full, could not send subscribe')
+            Rails.logger.error('[MQTT RAILS][ERROR] SUBACK queue is full, could not send subscribe')
             return MQTT_ERR_FAILURE
           end
           @waiting_suback.push(:id => new_id, :packet => packet, :timestamp => Time.now)
@@ -64,12 +64,12 @@ module MqttRails
           elsif max_qos[0] == 128
             adjust_qos.delete(t)
           else
-            Rails.logger.error("The QoS value is invalid in subscribe.")
+            Rails.logger.error("[MQTT RAILS][ERROR] The QoS value is invalid in subscribe.")
             raise PacketException.new('Invalid suback QoS value')
           end
         end
       else
-        Rails.logger.error("The packet id is invalid, already used.")
+        Rails.logger.error("[MQTT RAILS][ERROR] The packet id is invalid, already used.")
         raise PacketException.new("Invalid suback packet id: #{packet_id}")
       end
       @subscribed_mutex.synchronize do
@@ -86,7 +86,7 @@ module MqttRails
       if to_unsub.length == 1
         to_unsub = to_unsub.first[:packet].topics
       else
-        Rails.logger.error("The packet id is invalid, already used.")
+        Rails.logger.error("[MQTT RAILS][ERROR] The packet id is invalid, already used.")
         raise PacketException.new("Invalid unsuback packet id: #{packet_id}")
       end
 
@@ -107,7 +107,7 @@ module MqttRails
         @sender.append_to_writing(packet)
         @suback_mutex.synchronize do
           if @waiting_suback.length >= MAX_SUBACK
-            Rails.logger.error('SUBACK queue is full, could not send subscribe')
+            Rails.logger.error('[MQTT RAILS][ERROR] SUBACK queue is full, could not send subscribe')
             return MQTT_ERR_FAILURE
           end
           @waiting_suback.push(:id => new_id, :packet => packet, :timestamp => Time.now)
@@ -127,7 +127,7 @@ module MqttRails
         @sender.append_to_writing(packet)
         @unsuback_mutex.synchronize do
           if @waiting_suback.length >= MAX_UNSUBACK
-            Rails.logger.error('UNSUBACK queue is full, could not send unbsubscribe')
+            Rails.logger.error('[MQTT RAILS][ERROR] UNSUBACK queue is full, could not send unbsubscribe')
             return MQTT_ERR_FAIL
           end
           @waiting_unsuback.push(:id => new_id, :packet => packet, :timestamp => Time.now)

data/lib/mqtt_rails/version.rb

@@ -1,3 +1,3 @@
 module MqttRails
-  VERSION = "1.0"
+  VERSION = "1.0.1"
 end

data/samples/client_blocking(writing).rb

@@ -1,7 +1,5 @@
 require 'mqtt-rails'
 
-Rails.logger = ('mqtt_rails.log')
-
 client = MqttRails::Client.new()
 
 client.on_message = lambda { |p|  puts ">>>>> This is the callback for a message event <<<<<\nTopic: #{p.topic}\nPayload: #{p.payload}\nQoS: #{p.qos}" }

data/samples/getting_started.rb

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

data/samples/test_client.rb

@@ -1,7 +1,6 @@
 require "mqtt-rails"
 
 cli = MqttRails::Client.new({persistent: true, keep_alive: 7})
-Rails.logger = 'paho_log'
 
 cli.connect('localhost', 1883)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-rails
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Nicolas KOVACS