sparoid 1.0.18 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d3f9a0d1d95953662422a99f8d0170ce0db8df6ec82042e7f7d6d32e1721853
-  data.tar.gz: b2f702533aa2d6e1a96aed917a8cc77f8aa8916395944174c74644379392d7b8
+  metadata.gz: cd5b6193a911ddfbe06a7a01a2ad1abe3b2c4f60c090aaac4b6b2b6c6ac3dd3e
+  data.tar.gz: 622b9465e33bc1b69072450cf619ac2dcf7bf6ac3b1a70276a5f56c4c0d36907
 SHA512:
-  metadata.gz: c1803bdedaca58f7e172516864f502693e2478e43b7d9d5b8a0b5f306bb6284d4d19066e23235e9825c5f87ba0567f71388f19df52148cbce2637a17b8afd6d3
-  data.tar.gz: beb7813a740aa8d52d2689ee26c65872a45f991a9c2d2b937a46ba9451926471a064ca6635056441609a7bc8dfade4ef97aed2de130615b23d269e4ef308469e
+  metadata.gz: 8e773ffe52658eecff5b673f0b886a7bd40118654d24602b5c7bd50dbd1dd9a37561b28d51e9dcc2d93557212081f282a6b855f026a22ef646e013ea4c827755
+  data.tar.gz: bff75047af985b79ee7a1fc53c40abb3f6d15f5cad4cff86f94430cb599c246ce0a240e20e6c8fd1c4c53a8f79c447b142c69669093409979d10265ce6aa34f9

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [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.18"
+  VERSION = "1.0.20"
 end

data/lib/sparoid.rb

@@ -6,7 +6,7 @@ require "openssl"
 require "resolv"
 
 # Single Packet Authorisation client
-module Sparoid
+module Sparoid # rubocop:disable Metrics/ModuleLength
   extend self
 
   SPAROID_CACHE_PATH = ENV.fetch("SPAROID_CACHE_PATH", "/tmp/.sparoid_public_ip")
@@ -38,7 +38,7 @@ module Sparoid
   end
 
   # Connect to a TCP server and pass the FD to the parent
-  def fdpass(ips, port, connect_timeout: 10)
+  def fdpass(ips, port, connect_timeout: 10) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     # try connect to all IPs
     sockets = ips.map do |ip|
       Socket.new(Socket::AF_INET, Socket::SOCK_STREAM).tap do |s|
@@ -47,17 +47,22 @@ module Sparoid
     end
     # wait for any socket to be connected
     until sockets.empty?
-      _, writeable, = IO.select(nil, sockets, nil, connect_timeout)
+      _, 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
@@ -129,7 +134,7 @@ module Sparoid
       Resolv::IPv4.create f.read
     end
   rescue ArgumentError => e
-    return write_cache if e.message =~ /cannot interpret as IPv4 address/
+    return write_cache if /cannot interpret as IPv4 address/.match?(e.message)
 
     raise e
   end
@@ -163,5 +168,9 @@ module Sparoid
     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.18
+  version: 1.0.20
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor