amqp-client 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baa9c2034e80f56aa375a7abb7394109d2f4e84e4a4c04ae8bcb053d299d6dcc
-  data.tar.gz: 7857e1d6ddf96a64df664956da02eac2098fe144a5d2eea1364bd14ba5d41b7c
+  metadata.gz: 191cd8053858a46d350a6c89db378058c9c602bde3eadc95ee4ae79b149fb0cf
+  data.tar.gz: c322ca75508f8a9566170fa473b562dfe4b4989dc6b1e2baa68408612fe47692
 SHA512:
-  metadata.gz: 4deaecc1cdce66be71316e3046c5df0832c20a876ad0d3f5884c6e6313ece2d7fad8262f8ee83daad78500ca411648618642eb551c63279e8b84ec727d1f5633
-  data.tar.gz: 4136f5ce5c98610361a673f348fd531a93c34c7989275e7858bfc9694d7368adcbd17beb910fae30cd1fceb29163b7411d4ee0dc235f9c655bfdf960a9de4602
+  metadata.gz: 7c47bba0271dbd49b603127ac8749bfd85468ea7b0faa97d857eca585cde012094ace144b339a71d24fc4c90dace83f5e562669ae040ddb1eedd54b24eb6a876
+  data.tar.gz: 3ecb4641c83020063186fa1ac4413e6e42ae33ecb013eae3d2dcadfa1c30a3943ddf6320561ccb63917376ac23ac908c87f2d7e64abd7508c69c9f1030460e8e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [1.1.3] - 2021-11-04
+
+- Fixed: Reraise SystemcallError in connect so that reconnect works
+- Fixed: Keepalive support in OS X
+- Added: Make keepalive settings configurable (eg. amqp://?keepalive=60:10:3)
+
 ## [1.1.2] - 2021-10-15
 
 - Added: Support for JRuby and TruffleRuby

data/lib/amqp/client/connection.rb

@@ -24,6 +24,7 @@ module AMQP
       #    the smallest of the client's and the broker's values will be used
       # @option options [Integer] channel_max (2048) Maxium number of channels the client will be allowed to have open.
       #   Maxium allowed is 65_536.  The smallest of the client's and the broker's value will be used.
+      # @option options [String] keepalive (60:10:3) TCP keepalive setting, 60s idle, 10s interval between probes, 3 probes
       # @return [Connection]
       def initialize(uri = "", read_loop_thread: true, **options)
         uri = URI.parse(uri)
@@ -383,7 +384,8 @@ module AMQP
       def open_socket(host, port, tls, options)
         connect_timeout = options.fetch(:connect_timeout, 30).to_i
         socket = Socket.tcp host, port, connect_timeout: connect_timeout
-        enable_tcp_keepalive(socket)
+        keepalive = options.fetch(:keepalive, "").split(":", 3).map!(&:to_i)
+        enable_tcp_keepalive(socket, *keepalive)
         if tls
           cert_store = OpenSSL::X509::Store.new
           cert_store.set_default_paths
@@ -398,6 +400,8 @@ module AMQP
           socket.post_connection_check(host) || raise(Error, "TLS certificate hostname doesn't match requested")
         end
         socket
+      rescue SystemCallError, OpenSSL::OpenSSLError => e
+        raise Error, "Could not open a socket: #{e.message}"
       end
 
       # Negotiate a connection
@@ -462,11 +466,18 @@ module AMQP
 
       # Enable TCP keepalive, which is prefered to heartbeats
       # @return [void]
-      def enable_tcp_keepalive(socket)
+      def enable_tcp_keepalive(socket, idle = 60, interval = 10, count = 3)
         socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
-        socket.setsockopt(Socket::SOL_TCP, Socket::TCP_KEEPIDLE, 60)
-        socket.setsockopt(Socket::SOL_TCP, Socket::TCP_KEEPINTVL, 10)
-        socket.setsockopt(Socket::SOL_TCP, Socket::TCP_KEEPCNT, 3)
+        if Socket.const_defined?(:TCP_KEEPIDLE) # linux/bsd
+          socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPIDLE, idle)
+        elsif RUBY_PLATFORM.include? "darwin" # os x
+          # https://www.quickhack.net/nom/blog/2018-01-19-enable-tcp-keepalive-of-macos-and-linux-in-ruby.html
+          socket.setsockopt(Socket::IPPROTO_TCP, 0x10, idle)
+        else # windows
+          return
+        end
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPINTVL, interval)
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPCNT, count)
       rescue StandardError => e
         warn "AMQP-Client could not enable TCP keepalive on socket. #{e.inspect}"
       end

data/lib/amqp/client/version.rb

@@ -3,6 +3,6 @@
 module AMQP
   class Client
     # Version of the client library
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amqp-client
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies: []
 description: Work in progress
 email: