ll-innobackup 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1fb3c03e367f52aa8acb4b7965e53e2948334b1f
-  data.tar.gz: 6d8cbd3f78015ec3ef7b3b3cd1551f07a0800d4c
+SHA256:
+  metadata.gz: d2ca7b250814e3f83939af845ca2f7db199135f659862baaca1bba4cca6f942e
+  data.tar.gz: 3945ea705a4caec96da2ccfda6422e6064605707f0077618d927280329b408ab
 SHA512:
-  metadata.gz: b4af407b0eb9aeda269924f50a2b69eb562924ede8394e596a6e5b18312a1732cc68dae77c24dc8b8a9f7cc6ec87b17f02fc7a83b922362c2aa49562dd1e5248
-  data.tar.gz: 14506b97e5e7307bc1f955db29240c56a2f3ebfa5a2e67605e1240bde006790f5170f2fa7f443cf9dc766328443d427e0c01a10c0fbbe07b8acf38494f42b546
+  metadata.gz: bd758d78a0b5259bd88b6ca13733fa30fccf08e9690aba34f27a3761880d1803002b7ecacb80d7160991d046fedb448c5e23e32608b42d393aa9393d77530a6e
+  data.tar.gz: 1e336ff205f29223ddfec8bf52f0bff24411864a57c06db0e7a3a50debf4f9bdf693968fd92740c62af4beb7b115833c20b17d951b34ba2feab1d0873013f83d

data/lib/ll-innobackup.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'date'
+require 'aws-sdk-s3'
 
 # Run Inmental or Full backups on MySQL
 module LL
@@ -62,7 +63,8 @@ class InnoBackup
               :date,
               :state_files,
               :lock_files,
-              :options
+              :options,
+              :s3
 
   def initialize(options = {})
     @now = Time.now
@@ -71,6 +73,7 @@ class InnoBackup
     @lock_files = {}
     @state_files = {}
     @type = backup_type
+    @s3 = Aws::S3::Resource.new(region: 'eu-west-1')
   end
 
   def aws_log
@@ -217,10 +220,14 @@ class InnoBackup
     "--expected-size=#{expected_full_size}" if type == 'full'
   end
 
-  def aws_command
-    "#{aws_bin} s3 cp #{working_file} s3://#{aws_bucket}/#{aws_backup_file} "\
-    "#{expected_size} #{expires} "\
-    "2> #{aws_log} >> #{aws_log}"
+  def s3object_uploaded?(bucket_name, object_key, file_path)
+    object = @s3.bucket(bucket_name).object(object_key)
+      object.upload_file(file_path, {expires: expires_date, thread_count: @options['thread_count']}) do |r|
+        return true
+      end
+  rescue StandardError => e
+    STDERR.puts "Error uploading object: #{e.message}"
+    return false
   end
 
   def valid_commands?
@@ -234,8 +241,7 @@ class InnoBackup
     `#{innobackup_command}`
     @completed_inno = $CHILD_STATUS == 0
     raise InnoBackup::StateError, 'Unable to run innobackup correctly' unless @completed_inno
-    `#{aws_command}`
-    @completed_aws = $CHILD_STATUS == 0
+    @completed_aws = s3object_uploaded?(aws_bucket, aws_backup_file, working_file)
     raise InnoBackup::StateError, 'Unable to run aws upload correctly' unless @completed_aws
     return record if success? && completed?
   rescue InnoBackup::StateError => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ll-innobackup
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Stuart Harland, LiveLink Technology Ltd
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.6
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: A program to conduct innobackup
 email: essjayhch@gmail.com, infra@livelinktechnology.net
 executables:
@@ -37,7 +51,7 @@ homepage: http://rubygems.org/gems/ll-innobackup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -52,9 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Livelink Innobackup Script
 test_files: []