sparoid 1.0.19 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa860bf3df506199abf0f4abb417458de5758c1f87d2c7226688ed57f8f7a089
-  data.tar.gz: 46d9e5756c5eaaf85cd5cd51ebcf67aadc48929cb161d11a15236b24ddf02086
+  metadata.gz: aa670db15a1fcc9faa4784c1bf568dc93d07b6bbeacabc7ce64ab0c167672f23
+  data.tar.gz: 2c8694a91e39a2da4720b6ec48802b36a229f6a90d503065004783a6b5e10d97
 SHA512:
-  metadata.gz: 6601f26feedc978e69aee6c10b573fb7a0cf0304da6a083f7236ccfaa4b12ea0586b263845a65bcb7bde7ba217bae299f3c941eaa8592e16291851a3395b82f8
-  data.tar.gz: 6e71a0ee6ab5627e589808f753aed3d6dc39c6c04ada839fccbc85138d6bf46c391b7cb0565a738179d143b9e17a9cde8c37b6fbe28d525b734346690ba09434
+  metadata.gz: 248f53b8b4a2ad8f0dff46ad6ee3db3b3cce94f94c3c68ed8a38c1d2a5b97b3b2bcf912cb95da874b0079e7b8288a122d5726b7de5dacbe770fc4f4a20fc5f83
+  data.tar.gz: c9300feaee2514fd6403b00fdc61e1a5092e02c0973f89959205c423f5f4cb0362c7aa3f091820169634950749f9ddd1f86f9ad84a0a3270c224680a5e6bcee8

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.0.21] - 2022-10-12
+
+- Fix where Sparoid::Instance returned nil for public_ip
+
+## [1.0.20] - 2022-10-11
+
+- Ignore EISCONN errors (already connected) error as BSD raises on second connect_nonblock
+- Don't read from public ip disk cache in Sparoid::Instance
+
+## [1.0.19] - 2022-10-11
+
+- Fix nil error on timeout
+
 ## [1.0.18] - 2022-10-10
 
 - Only resolv the IP(s) once

data/lib/sparoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sparoid
-  VERSION = "1.0.19"
+  VERSION = "1.0.21"
 end

data/lib/sparoid.rb

@@ -47,19 +47,22 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
     end
     # wait for any socket to be connected
     until sockets.empty?
-      _, writeable, = IO.select(nil, sockets, nil, connect_timeout)
-      break if writeable.nil? # All sockets timedout
-
+      _, writeable, errors = IO.select(nil, sockets, nil, connect_timeout) || break
+      errors.each { |s| sockets.delete(s) }
       writeable.each do |s|
         idx = sockets.index(s)
         sockets.delete_at(idx) # don't retry this socket again
         ip = ips.delete_at(idx) # find the IP for the socket
-        s.connect_nonblock(Socket.sockaddr_in(port, ip)) # check for errors
+        begin
+          s.connect_nonblock(Socket.sockaddr_in(port, ip)) # check for errors
+        rescue Errno::EISCONN
+          # already connected, continue
+        rescue SystemCallError
+          next # skip connection errors, hopefully at least one succeeds
+        end
         # pass the connected FD to the parent process over STDOUT
         Socket.for_fd(1).sendmsg "\0", 0, nil, Socket::AncillaryData.unix_rights(s)
         exit 0 # exit as fast as possible so that other sockets don't connect
-      rescue SystemCallError
-        next # ignore connection errors, hopefully at least one succeeds
       end
     end
     exit 1 # all connections failed
@@ -68,7 +71,8 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
   private
 
   def sendmsg(addrs, data)
-    socket = Socket.new Socket::AF_INET, Socket::SOCK_DGRAM
+    socket = UDPSocket.new
+    socket.nonblock = false
     addrs.each do |addr|
       socket.sendmsg data, 0, addr
     rescue StandardError => e
@@ -165,5 +169,9 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
     def public_ip
       @public_ip ||= super
     end
+
+    def cached_public_ip
+      public_ip
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.21
 platform: ruby
 authors:
 - Carl Hörberg
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,7 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - carl@84codes.com
 executables:
@@ -55,7 +55,7 @@ metadata:
   source_code_uri: https://github.com/84codes/sparoid.rb
   changelog_uri: https://raw.githubusercontent.com/84codes/sparoid.rb/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Single Packet Authorisation client
 test_files: []