opswalrus 1.0.100 → 1.0.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03d48413be839240754e534eb147da0c5fee292c458b48233c903de045fef44
-  data.tar.gz: fae4f4c68fbf572b8f9f6b2ed226bb170ca14ae7f0ef652c65f16765fb67b043
+  metadata.gz: cca021b1f893590122d04d39fe29b0a3543438df33e16b1061b7a8db9ac3ddc7
+  data.tar.gz: f5de23d139bd4bb8533159760e62ef3e7e25153c47e45c610ef8a2df219b43a7
 SHA512:
-  metadata.gz: 11dd483152012c48dc536e5d55e16a3463a1bd8fb23b8f20e4742b424e5f5df77e5bff2289758160e14a7fab2bbd40e54bef745d1010b786459658ea95588867
-  data.tar.gz: b93e47275fe2319876ffa496b400d3c8e57efc2f93d6f6a981408a0c5d0dd92f31afdb21c13732ed2c2256f58eda0c14e3c5d2822cbd2970b2d351c18bc07f15
+  metadata.gz: 0bd03838bb556158b41f0c237719ee427ea6d0de3f46afb7370e66dd1f8f8ed04a5111fa6c9be8ad8242e2a1076d5e64a019f31a9c633c9b8123ea780ccaf737
+  data.tar.gz: 227b14b284ba96f3697570c335c5b53d724a1f751fa4f55727d9905da46d32da605e483f8789bfca2b7ac303f67f0179a2664a8307747687f47f4b7f6e351052

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.100)
+    opswalrus (1.0.102)
       activesupport (~> 7.0)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)

data/lib/opswalrus/host.rb

@@ -173,12 +173,15 @@ module OpsWalrus
       }
     end
 
-    def autoretry(&block)
+    def autoretry(delay: 5, timeout: 300, &block)
       attempts ||= 0
       attempts += 1
       block.call
     rescue RetriableRemoteInvocationError => e
-      retry if attempts <= 3
+      if attempts <= 3
+        reconnected = reconnect(delay, timeout)
+        retry if reconnected
+      end
     end
 
     # returns an integer number of seconds if reconnected; nil otherwise

data/lib/opswalrus/invocation.rb

@@ -151,7 +151,8 @@ module OpsWalrus
         end
         # todo: make sure this cleanup is present
         if remote_json_kwargs_tempfile_basename
-          @host_proxy.execute(:rm, "-f", remote_json_kwargs_tempfile_basename)
+          # this may fail if the remote host reboots and we try to subsequently connect and delete the file
+          @host_proxy.execute(:rm, "-f", remote_json_kwargs_tempfile_basename) rescue nil
         end
       end
     end
@@ -293,7 +294,8 @@ module OpsWalrus
         end
         # todo: make sure this cleanup is present
         if remote_json_kwargs_tempfile_basename
-          @host_proxy.execute(:rm, "-f", remote_json_kwargs_tempfile_basename)
+          # this may fail if the remote host reboots and we try to subsequently connect and delete the file
+          @host_proxy.execute(:rm, "-f", remote_json_kwargs_tempfile_basename) rescue nil
         end
       end
     end

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -221,9 +221,9 @@ module OpsWalrus
       @runtime_env.app.inventory(tags).hosts
     end
 
-    # delay: integer?     # default: 1 - 1 second delay before reboot
-    def reboot(delay: 1)
-      delay = 1 if delay < 1
+    # delay: integer?     # default: 5 - 5 second delay before reboot
+    def reboot(delay: 5)
+      delay = 5 if delay < 1
 
       # desc "Rebooting"
       rebooting = sh? 'sudo /bin/sh -c "(sleep {{ delay }} && reboot) &"'.mustache

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.100"
+  VERSION = "1.0.102"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.100
+  version: 1.0.102
 platform: ruby
 authors:
 - David Ellis