omq 0.17.8 → 0.18.0

data/lib/omq/transport/tcp.rb

@@ -18,7 +18,7 @@ module OMQ
         #
         def bind(endpoint, engine)
           host, port = self.parse_endpoint(endpoint)
-          host = "0.0.0.0" if host == "*"
+          host = "0.0.0.0" if host == "*" # FIXME: support IPv6, see omq-cli v0.11.2
 
           addrs = Addrinfo.getaddrinfo(host, port, nil, :STREAM, nil, ::Socket::AI_PASSIVE)
           raise ::Socket::ResolutionError, "no addresses for #{host}" if addrs.empty?
@@ -85,9 +85,20 @@ module OMQ
         end
 
 
+        # Applies SO_SNDBUF / SO_RCVBUF to +sock+ from the socket's
+        # {Options}. No-op when both are nil (OS default).
+        #
+        # @param sock [Socket, TCPSocket]
+        # @param options [Options]
+        #
         def apply_buffer_sizes(sock, options)
-          sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, options.sndbuf) if options.sndbuf
-          sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVBUF, options.rcvbuf) if options.rcvbuf
+          if options.sndbuf
+            sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, options.sndbuf)
+          end
+
+          if options.rcvbuf
+            sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVBUF, options.rcvbuf)
+          end
         end
       end
 
@@ -130,11 +141,16 @@ module OMQ
         #
         def start_accept_loops(parent_task, &on_accepted)
           @tasks = @servers.map do |server|
-            parent_task.async(transient: true, annotation: "tcp accept #{@endpoint}") do
+            # TODO: use this server's exact host:port (@endpoint might not be unique)
+            annotation = "tcp accept #{@endpoint}"
+            parent_task.async(transient: true, annotation:) do
               loop do
                 client = server.accept
                 TCP.apply_buffer_sizes(client, @engine.options)
-                Async::Task.current.defer_stop { on_accepted.call(IO::Stream::Buffered.wrap(client)) }
+                Async::Task.current.defer_stop do
+                  # TODO: why not yield?
+                  on_accepted.call(IO::Stream::Buffered.wrap(client))
+                end
               end
             rescue Async::Stop
             rescue IOError

data/lib/omq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OMQ
-  VERSION = "0.17.8"
+  VERSION = "0.18.0"
 end

data/lib/omq/writable.rb

@@ -15,7 +15,11 @@ module OMQ
     #
     def send(message)
       parts = freeze_message(message)
-      Reactor.run { with_timeout(@options.write_timeout) { @engine.enqueue_send(parts) } }
+
+      Reactor.run timeout: @options.write_timeout do |task|
+        @engine.enqueue_send(parts)
+      end
+
       self
     end
 

data/lib/omq.rb

@@ -38,6 +38,7 @@ module OMQ
     IO::Stream::ConnectionResetError,
   ]
 
+
   # Errors raised when a peer cannot be reached.
   CONNECTION_FAILED = [
     Errno::ECONNREFUSED,
@@ -57,7 +58,7 @@ module OMQ
     CONNECTION_LOST.freeze
     CONNECTION_FAILED.freeze
     Engine.transports.freeze
-    Routing.instance_variable_get(:@registry).freeze
+    Routing.registry.freeze
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq
 version: !ruby/object:Gem::Version
-  version: 0.17.8
+  version: 0.18.0
 platform: ruby
 authors:
 - Patrik Wenger
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement