kamal-backup 0.3.0.beta10 → 0.3.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c534b081ef41f75a8d10e72ae0fcbaa7b81ad5a0f2cbb3a12c281353d74ab69b
-  data.tar.gz: 6bd3b48d5573ab6a1e19ec1452584b7d44fc62e852edb7c202e2191d3bac6743
+  metadata.gz: a292aa17220ba3ef9cf77c566d5530ece93450aeaa3b01e8f3eaf234ca00859a
+  data.tar.gz: 19a798a19c52f3467fabac4bd5699d0a0b717fe2e9c0da238083aea1e99766cc
 SHA512:
-  metadata.gz: fdef6636e464308da24e9bb11aa64d8e68535fc9a8fc261a4dce02dc7e0d0bd26f20320f9dfede598085d780764310b0b3a7ad71ba3fe8d48e61d5c756b3597a
-  data.tar.gz: de0667fae6cb0ae276f1b4511ea1c63ffe8655523648a0e3f1e40d6872e53ba2823b4d987d4e651ace4d47710d516d17dc32f9e269e9bd20115501a533f793be
+  metadata.gz: aa21d79ea00396dcd2a4f0496ef79c29e9db626a6f31e9969e99ff6560149ddb8aa3cdd0819490d896e770e39a655f4d0212c6b9a02fe0be46bbe1bc8a5441ac
+  data.tar.gz: 622747a659f8d7dc0c02b65888d51693d7388772a99f6459ba919ddaa8603be18dd90299c7f7c03fbb40906154b1c9c3aeace84986b22637381e8762a37bbb5b

data/lib/kamal_backup/cli.rb

@@ -429,6 +429,10 @@ module KamalBackup
       output ||= CommandOutput.new(io: $stderr, env: env)
       output.error("(#{e.class}): #{e.message}", redactor: Redactor.new(env: env))
       exit(1)
+    rescue StandardError => e
+      output ||= CommandOutput.new(io: $stderr, env: env)
+      output.error("(#{e.class}): #{e.message}", redactor: Redactor.new(env: env))
+      exit(1)
     rescue Interrupt
       output ||= CommandOutput.new(io: $stderr, env: env)
       output.error("(Interrupt): interrupted", redactor: Redactor.new(env: env))

data/lib/kamal_backup/restic.rb

@@ -48,13 +48,20 @@ module KamalBackup
         Open3.popen3(command.env, *command.argv) do |stdin, stdout, stderr, wait_thread|
           stdout_reader = Thread.new { Command.collect_stream(stdout, command_output: output, context: context, stream: :stdout, redactor: redactor) }
           stderr_reader = Thread.new { Command.collect_stream(stderr, command_output: output, context: context, stream: :stderr, redactor: redactor) }
-          IO.copy_stream(file, stdin)
-          stdin.close
+          copy_error = nil
+          begin
+            IO.copy_stream(file, stdin)
+          rescue Errno::EPIPE => e
+            copy_error = e
+          ensure
+            stdin.close unless stdin.closed?
+          end
           out = stdout_reader.value
           err = stderr_reader.value
           status = wait_thread.value
           output&.command_exit(context, status.exitstatus)
           raise_command_error(command, status, out, err) unless status.success?
+          raise_stream_error(command, copy_error, out, err) if copy_error
 
           CommandResult.new(stdout: out, stderr: err, status: status.exitstatus)
         end
@@ -309,6 +316,15 @@ module KamalBackup
         )
       end
 
+      def raise_stream_error(command, error, stdout, stderr)
+        raise CommandError.new(
+          "failed to stream file to #{command.display(redactor)}: #{error.message}\n#{redactor.redact_string(stderr)}",
+          command: command,
+          stdout: redactor.redact_string(stdout),
+          stderr: redactor.redact_string(stderr)
+        )
+      end
+
       def write_last_check(payload)
         FileUtils.mkdir_p(config.state_dir)
         File.write(config.last_check_path, JSON.pretty_generate(payload.transform_values { |value| value.respond_to?(:iso8601) ? value.iso8601 : redactor.redact_string(value.to_s) }))

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.3.0.beta10"
+  VERSION = "0.3.0.beta11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta10
+  version: 0.3.0.beta11
 platform: ruby
 authors:
 - crmne