remotus 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86bb2b7b3be25ec98b48372e32f75f6ae70471bdb72635a44a1f50b20c1f5421
-  data.tar.gz: a2f1b203c618ffb909bc55f7edd0718bd960d53b968ea5418f1a80c7ff05b9a6
+  metadata.gz: e6b07dbe42ab741bdb688bed9f6ce1d09ed2af8643291c57ec9aeedaaad0a19a
+  data.tar.gz: a39ecf434564157c1e72d98cf840abadc1a406f91988ee7c47cf7c22d9643760
 SHA512:
-  metadata.gz: 28acc8709f9bcc670d175471973f309f76af530e4fb9cf1b566f58405ef4516fddc20dec63ca318c768c8f6247f6314d64838d2314fc5cf3f18a736f8fc24d38
-  data.tar.gz: e8d1a7cb11844225214b55fb59de52c0af958e8640db57c15eefac3e92dc3cae63a8186165108158ca93da134961a08f163fd7e2d7ec381f84524587a2881e98
+  metadata.gz: f48c3e374b870a60664cf35838204755a83599a534113309abfecb40e5a5862f10091bd7bc19d8353a8a5716c71fe02dea043f891db998dd521451a998be4419
+  data.tar.gz: 0c3d1f3e5dfbae5c2aeaec9d18f3eb4f4b99759b4c883e3298691e7cad7a91fa71d03f595cffb9bab07f9191844284a211c5fb76ff7900af56791ea6ed9a6f2a

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+.vscode

data/.rubocop.yml

@@ -14,7 +14,7 @@ Layout/LineLength:
   Max: 150
 
 Metrics/ClassLength:
-  Max: 250
+  Max: 300
 
 Metrics/BlockLength:
   Exclude:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.1.0] - 2023-05-25
+* Improve exponential backoff during SSH retries.
+* Force connection close on IOError (closed stream).
+
 ## [1.0.0] - 2023-04-25
 * Update SSH dependencies to handle `pkeys are immutable on OpenSSL 3.0` errors on newer Ruby versions
 * Remove Ruby 2.5 support

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remotus (1.0.0)
+    remotus (1.1.0)
       connection_pool (~> 2.4)
       net-scp (~> 4.0)
       net-ssh (~> 7.1)

data/lib/remotus/ssh_connection.rb

@@ -20,7 +20,7 @@ module Remotus
     KEEPALIVE_INTERVAL = 300
 
     # Number of default retries
-    DEFAULT_RETRIES = 2
+    DEFAULT_RETRIES = 8
 
     # Base options for new SSH connections
     BASE_CONNECT_OPTIONS = { non_interactive: true, keepalive: true, keepalive_interval: KEEPALIVE_INTERVAL }.freeze
@@ -424,6 +424,8 @@ module Remotus
     # @param [Integer] retries number of retries
     #
     def with_retries(command, retries)
+      sleep_time = 1
+
       yield if block_given?
     rescue Remotus::AuthenticationError, Net::SSH::AuthenticationFailed => e
       # Re-raise exception if the retry count is exceeded
@@ -446,6 +448,12 @@ module Remotus
       retries -= 1
       raise if e.to_s != "closed stream" || retries.negative?
 
+      # Close the existing connection before retrying again
+      close
+
+      Remotus.logger.debug { "Sleeping for #{sleep_time} seconds before next retry..." }
+      sleep sleep_time
+      sleep_time *= 2 # Double delay for each retry
       retry
     end
 

data/lib/remotus/version.rb

@@ -2,5 +2,5 @@
 
 module Remotus
   # Remotus gem version
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remotus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthew Newell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool