stomp 1.3.0 → 1.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzAwZGNiZmI2NzJkZWZkNWNlZWY4NDZiZTU3NjFiNzhkNjRmNDkyOA==
+    NDk2MTQ0MmYyZmUzZDhkYTRhZDQ5MTg1Y2EwZTk2ZDQzODNkYjIxMg==
   data.tar.gz: !binary |-
-    MmUyNDgwOWVmOWYxMmRmMjIxMTZlZDQxMmI3ODcxMTk5ODRlNzQyNA==
+    ZjFjMzc4ZGNhMWEzY2ZmZDJhODk5MmZhM2FhNzZmMzY0MWUyNzJhMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjA2MDRjODc2MjEwODVjNTFjZDRkYzFmZDdhNGVmN2FiN2NmYjNkOTE2YmIz
-    YzExNWI3OWE1ZjEzMDMwNmJiNDAxYmYxOGFiMjhiYjEzZGY4YWMxMzc5NzI1
-    NTUyNjgwYmQwYjQyNzlkNjlkYmM4M2VkN2QwZjYwZDUyMTU4NWI=
+    OTI5ZjFlNzFjMzFhNWUyZDA2YjRlYmFiZjVlNmE4ZGI4YWExZjgyZGMyOTgw
+    ZTY3N2ZkY2EzNmRmM2ZjYWZmYmQyMGZjZjIxMTkyNTBmY2IyZGI1NWVjYWZi
+    YmNjNzdiZTU2NzRmMTFiZmIyMzYyYjI4ZDZkZGQ2YzA1OGNmZDM=
   data.tar.gz: !binary |-
-    OTNmMjliOTM4NmI3NmRjOTllNzc0NWE2MDM2YTZlZTg2ZTk1YTBlMDEwMjRk
-    YTk2MGM3ZDFkNzUxZDc3OGI4ZmRkNWI5OWJhZTdjOGVlMzY0MmU3YzljMDU5
-    NWMxZTkwMTk4ZDAwODA2ZDA5YTZiZmQ5N2Q1M2JhMDJkNjZhMmY=
+    NmNmZWRjMGYyYWYzNTI3NTA4ZDEwMjQxYTdlYWExZDQ5ZTBkOWIzYmYzMGUz
+    NDg3YjY5OTE5MzM4NWQ3OTVhZDcwZGUwZGVhYTFmNjJjY2ZjMTA2NjgyZDBi
+    NzEzNTBjYTA5NzY4ZTc1MmRlN2Y5MzE3ZTcwNTdkNjFiNzU0OGI=

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 1.3.1 20131002
+
+* Method calls to the logger object should check for that method first (#83)
+
 == 1.3.0 20130930
 
 * ERROR frames now raise an exception in the Stomp::Client thread(#73, #81)

data/README.rdoc

@@ -12,6 +12,7 @@ An implementation of the Stomp protocol for Ruby. See:
 
 See _CHANGELOG.rdoc_ for details.
 
+* Gem version 1.3.1. Bugfix for logging.
 * Gem version 1.3.0. Added ERROR frame raising as exception, added anonymous connections, miscellaneous other fixes.
 * Gem version 1.2.16. Fixed Stomp::Client to expose its connection's host parameters.
 * Gem version 1.2.15. Timeout cleanup, added license info to gemspec.
@@ -65,6 +66,7 @@ See _CHANGELOG.rdoc_ for details.
                                           # correct for your environment, expect unnecessary fail overs
       :connread_timeout => 0,             # Timeout during CONNECT for read of CONNECTED/ERROR, secs
       :tcp_nodelay => true,               # Turns on the TCP_NODELAY socket option; disables Nagle's algorithm
+      :start_timeout => 10,               # Timeout around initialization
     }
 
     # for client

data/lib/connection/heartbeats.rb

@@ -100,7 +100,10 @@ module Stomp
           sleep(slt)
           next unless @socket # nil under some circumstances ??
           curt = Time.now.to_f
-          @logger.on_hbfire(log_params, "send_fire", :curt => curt, :last_sleep => slt)
+
+          if @logger && @logger.respond_to?(:on_hbfire)
+            @logger.on_hbfire(log_params, "send_fire", :curt => curt, :last_sleep => slt)
+          end
 
           delta = curt - @ls
           # Be tolerant (minus), and always do this the first time through.
@@ -108,9 +111,11 @@ module Stomp
           compval = (@hbsend_interval - (@hbsend_interval/5.0)) / 1000000.0
           if delta > compval || first_time
             first_time = false
-            @logger.on_hbfire(log_params, "send_heartbeat", :last_sleep => slt,
-                              :curt => curt, :last_send => @ls, :delta => delta,
-                              :compval => compval)
+            if @logger && @logger.respond_to?(:on_hbfire)
+              @logger.on_hbfire(log_params, "send_heartbeat", :last_sleep => slt,
+                                :curt => curt, :last_send => @ls, :delta => delta,
+                                :compval => compval)
+            end
             # Send a heartbeat
             @transmit_semaphore.synchronize do
               begin
@@ -121,8 +126,10 @@ module Stomp
                 @hbsend_count += 1
               rescue Exception => sendex
                 @hb_sent = false # Set the warning flag
-                @logger.on_hbwrite_fail(log_params, {"ticker_interval" => sleeptime,
-                                                     "exception" => sendex})
+                if @logger && @logger.respond_to?(:on_hbwrite_fail)
+                  @logger.on_hbwrite_fail(log_params, {"ticker_interval" => sleeptime,
+                                                       "exception" => sendex})
+                end
                 if @hbser
                   raise # Re-raise if user requested this, otherwise ignore
                 end
@@ -160,12 +167,16 @@ module Stomp
           next unless @socket # nil under some circumstances ??
           rdrdy = _is_ready?(@socket)
           curt = Time.now.to_f
-          @logger.on_hbfire(log_params, "receive_fire", :curt => curt)
+          if @logger && @logger.respond_to?(:on_hbfire)
+            @logger.on_hbfire(log_params, "receive_fire", :curt => curt)
+          end
           #
           begin
             delta = curt - @lr
             if delta > sleeptime
-              @logger.on_hbfire(log_params, "receive_heartbeat", {})
+              if @logger && @logger.respond_to?(:on_hbfire)
+                @logger.on_hbfire(log_params, "receive_heartbeat", {})
+              end
               # Client code could be off doing something else (that is, no reading of
               # the socket has been requested by the caller).  Try to  handle that case.
               lock = @read_semaphore.try_lock
@@ -192,20 +203,24 @@ module Stomp
                   @read_semaphore.unlock # Release read lock
                   @hb_received = false
                   read_fail_count += 1
-                  @logger.on_hbread_fail(log_params, {"ticker_interval" => sleeptime,
-                                                      "read_fail_count" => read_fail_count,
-                                                      "lock_fail" => false,
-                                                      "lock_fail_count" => lock_fail_count})
+                  if @logger && @logger.respond_to?(:on_hbread_fail)
+                    @logger.on_hbread_fail(log_params, {"ticker_interval" => sleeptime,
+                                                         "read_fail_count" => read_fail_count,
+                                                         "lock_fail" => false,
+                                                         "lock_fail_count" => lock_fail_count})
+                  end
                 end
               else  # try_lock failed
                 # Shrug.  Could not get lock.  Client must be actually be reading.
                 @hb_received = false
                 # But notify caller if possible
                 lock_fail_count += 1
-                @logger.on_hbread_fail(log_params, {"ticker_interval" => sleeptime,
-                                                    "read_fail_count" => read_fail_count,
-                                                    "lock_fail" => true,
-                                                    "lock_fail_count" => lock_fail_count})
+                if @logger && @logger.respond_to?(:on_hbread_fail)
+                  @logger.on_hbread_fail(log_params, {"ticker_interval" => sleeptime,
+                                                      "read_fail_count" => read_fail_count,
+                                                      "lock_fail" => true,
+                                                      "lock_fail_count" => lock_fail_count})
+                end
               end # of the try_lock
 
             else # delta <= sleeptime
@@ -214,10 +229,12 @@ module Stomp
               lock_fail_count = 0 # reset
             end # of the if delta > sleeptime
           rescue Exception => recvex
-            @logger.on_hbread_fail(log_params, {"ticker_interval" => sleeptime,
-                                                "exception" => recvex,
-                                                "read_fail_count" => read_fail_count,
-                                                "lock_fail_count" => lock_fail_count})
+            if @logger && @logger.respond_to?(:on_hbread_fail)
+              @logger.on_hbread_fail(log_params, {"ticker_interval" => sleeptime,
+                                                  "exception" => recvex,
+                                                  "read_fail_count" => read_fail_count,
+                                                  "lock_fail_count" => lock_fail_count})
+            end
             fail_hard = true
           end
           # Do we want to attempt a retry?

data/lib/connection/netio.rb

@@ -130,8 +130,11 @@ module Stomp
           @failure = $!
           raise unless @reliable
           errstr = "transmit to #{@host} failed: #{$!}\n"
-          @logger.on_miscerr(log_params, "es_trans: " + errstr)
-          $stderr.print errstr
+          if @logger && @logger.respond_to?(:on_miscerr)
+            @logger.on_miscerr(log_params, "es_trans: " + errstr)
+          else
+            $stderr.print errstr
+          end
           # !!! This loop initiates a re-connect !!!
           _reconn_prep()
         end
@@ -198,7 +201,9 @@ module Stomp
     def open_tcp_socket()
       tcp_socket = nil
 
-      @logger.on_connecting(log_params)
+      if @logger && @logger.respond_to?(:on_connecting)
+        @logger.on_connecting(log_params)
+      end
 
       Timeout::timeout(@connect_timeout, Stomp::Error::SocketOpenTimeout) do
         tcp_socket = TCPSocket.open(@host, @port)
@@ -276,7 +281,9 @@ module Stomp
 
         #
         ssl = nil
-        @logger.on_ssl_connecting(log_params)
+        if @logger && @logger.respond_to?(:on_ssl_connecting)
+          @logger.on_ssl_connecting(log_params)
+        end
 
         Timeout::timeout(@connect_timeout, Stomp::Error::SocketOpenTimeout) do
           tcp_socket = TCPSocket.open(@host, @port)
@@ -297,12 +304,16 @@ module Stomp
           end
           @ssl.peer_cert = ssl.peer_cert
         end
-        @logger.on_ssl_connected(log_params)
+        if @logger && @logger.respond_to?(:on_ssl_connected)
+          @logger.on_ssl_connected(log_params)
+        end
         ssl
       rescue Exception => ex
-        lp = log_params.clone
-        lp[:ssl_exception] = ex
-        @logger.on_ssl_connectfail(lp)
+        if @logger && @logger.respond_to?(:on_ssl_connectfail)
+          lp = log_params.clone
+          lp[:ssl_exception] = ex
+          @logger.on_ssl_connectfail(lp)
+        end
         #
         raise # Reraise
       end

data/lib/connection/utils.rb

@@ -116,7 +116,9 @@ module Stomp
             used_socket = open_socket() # sets @closed = false if OK
             # Open is complete
             connect(used_socket)
-            @logger.on_connected(log_params)
+            if @logger && @logger.respond_to?(:on_connected)
+              @logger.on_connected(log_params)
+            end
             @connection_attempts = 0
           rescue
             @failure = $!
@@ -130,13 +132,16 @@ module Stomp
             # b) should never be retried
             raise if @failure.is_a?(Stomp::Error::ProtocolError11p)
 
-            # on_connectfail may raise
-            begin
-              @logger.on_connectfail(log_params)
-            rescue Exception => aex
-              raise if aex.is_a?(Stomp::Error::LoggerConnectionError)
+            if @logger && @logger.respond_to?(:on_connectfail)
+              # on_connectfail may raise
+              begin
+                @logger.on_connectfail(log_params)
+              rescue Exception => aex
+                raise if aex.is_a?(Stomp::Error::LoggerConnectionError)
+              end
+            else
+              $stderr.print "connect to #{@host} failed: #{$!} will retry(##{@connection_attempts}) in #{@reconnect_delay}\n"
             end
-            $stderr.print "connect to #{@host} failed: #{$!} will retry(##{@connection_attempts}) in #{@reconnect_delay}\n"
             raise Stomp::Error::MaxReconnectAttempts if max_reconnect_attempts?
 
             sleep(@reconnect_delay)
@@ -232,8 +237,11 @@ module Stomp
           @failure = $!
           raise unless @reliable
           errstr = "receive failed: #{$!}"
-          @logger.on_miscerr(log_params, "es_oldrecv: " + errstr)
-          $stderr.print errstr
+          if @logger && @logger.respond_to?(:on_miscerr)
+            @logger.on_miscerr(log_params, "es_oldrecv: " + errstr)
+          else
+            $stderr.print errstr
+          end
 
           # !!! This initiates a re-connect !!!
           _reconn_prep()

data/lib/stomp/version.rb

@@ -6,7 +6,7 @@ module Stomp
   module Version  #:nodoc: all
     MAJOR = 1
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/stomp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "stomp"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian McCallister", "Marius Mathiesen", "Thiago Morello", "Guy M. Allard"]
-  s.date = "2013-09-30"
+  s.date = "2013-10-02"
   s.description = "Ruby client for the Stomp messaging protocol.  Note that this gem is no longer supported on rubyforge."
   s.email = ["brianm@apache.org", "marius@stones.com", "morellon@gmail.com", "allard.guy.m@gmail.com"]
   s.executables = ["catstomp", "stompcat"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stomp
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Brian McCallister
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec