airblade-mysql_s3_backup 0.0.2 → 0.0.3

data/config/sample.yml

@@ -15,4 +15,5 @@ s3:
   # S3 credentials
   access_key_id: XXXXXXXXXXXXXXX
   secret_access_key: XXXXXXXXXXXXXXXXXXXXXX
-  
+  timeout: 30
+

data/lib/mysql_s3_backup/backup.rb

@@ -1,61 +1,78 @@
 require 'tempfile'
 require 'lockfile'
+require 'terminator'
 
 module MysqlS3Backup
   class Backup
-    attr_reader :mysql, :bucket
-    
-    def initialize(mysql, bucket)
+    attr_reader :mysql, :bucket, :timeout
+
+    def initialize(mysql, bucket, timeout=30)
       @mysql = mysql
       @bucket = bucket
+      @timeout = timeout
       @bin_log_prefix = "#{@mysql.database}/bin_logs"
     end
-    
+
     def full(name=make_new_name)
       lock do
-        # When the full backup runs it delete any binary log files that might already exist
-        # in the bucket. Otherwise the restore will try to restore them even though they’re
-        # older than the full backup.
-        @bucket.delete_all @bin_log_prefix
-      
-        with_temp_file do |file|
-          @mysql.dump(file)
-          @bucket.store(dump_file_name(name), file)
-          @bucket.copy(dump_file_name(name), dump_file_name("latest"))
+        timeout do
+          # When the full backup runs it delete any binary log files that might already exist
+          # in the bucket. Otherwise the restore will try to restore them even though they’re
+          # older than the full backup.
+          @bucket.delete_all @bin_log_prefix
+
+          with_temp_file do |file|
+            @mysql.dump(file)
+            @bucket.store(dump_file_name(name), file)
+            @bucket.copy(dump_file_name(name), dump_file_name("latest"))
+          end
         end
       end
     end
-    
+
     def incremental
       lock do
-        @mysql.each_bin_log do |log|
-          @bucket.store "#{@bin_log_prefix}/#{File.basename(log)}", log
+        timeout do
+          @mysql.each_bin_log do |log|
+            @bucket.store "#{@bin_log_prefix}/#{File.basename(log)}", log
+          end
         end
       end
     end
     alias :inc :incremental
-    
+
     def restore(name="latest")
       lock do
-        # restore from the dump file
-        with_temp_file do |file|
-          @bucket.fetch(dump_file_name(name), file)
-          @mysql.restore(file)
-        end
-      
-        if name == "latest"
-          # Restoring binary log files
-          @bucket.find("#{@bin_log_prefix}/").sort.each do |log|
-            with_temp_file do |file|
-              @bucket.fetch log, file
-              @mysql.apply_bin_log file
+        timeout do
+          # restore from the dump file
+          with_temp_file do |file|
+            @bucket.fetch(dump_file_name(name), file)
+            @mysql.restore(file)
+          end
+
+          if name == "latest"
+            # Restoring binary log files
+            @bucket.find("#{@bin_log_prefix}/").sort.each do |log|
+              with_temp_file do |file|
+                @bucket.fetch log, file
+                @mysql.apply_bin_log file
+              end
             end
           end
         end
       end
     end
-    
+
     private
+
+      def timeout
+        result = nil
+        Terminator.terminate @timeout do
+          result = yield
+        end
+        result
+      end
+
       def lock
         result = nil
         Lockfile("mysql_s3_backup_lock", :retries => 0) do
@@ -63,16 +80,16 @@ module MysqlS3Backup
         end
         result
       end
-      
+
       def dump_file_name(name)
         raise ArgumentError, "Need a backup name" unless name.is_a?(String)
         "#{@mysql.database}/dumps/#{name}.sql.gz"
       end
-      
+
       def make_new_name
         Time.now.utc.strftime("%Y%m%d%H%M")
       end
-      
+
       def with_temp_file
         dump_file = Tempfile.new("mysql-dump")
         yield dump_file.path
@@ -81,4 +98,4 @@ module MysqlS3Backup
         dump_file.close!
       end
   end
-end
+end

data/lib/mysql_s3_backup/config.rb

@@ -3,28 +3,29 @@ require "yaml"
 module MysqlS3Backup
   class Config
     attr_reader :mysql_config, :s3_config, :bucket
-    
+
     def initialize(config)
       config = config.symbolize_keys
       @mysql_config = config[:mysql].symbolize_keys
       @s3_config = config[:s3].symbolize_keys
       @bucket = @s3_config.delete(:bucket)
+      @timeout = @s3_config.delete(:timeout)
     end
-    
+
     def mysql
       MysqlS3Backup::Mysql.new(@mysql_config)
     end
-    
+
     def bucket
       MysqlS3Backup::Bucket.new(@bucket, @s3_config)
     end
-    
+
     def backup
-      MysqlS3Backup::Backup.new(mysql, bucket)
+      MysqlS3Backup::Backup.new(mysql, bucket, @timeout)
     end
-    
+
     def self.from_yaml_file(file)
       new YAML.load_file(file)
     end
   end
-end
+end

data/mysql_s3_backup.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = "airblade-mysql_s3_backup"
-  s.version         = "0.0.2"
+  s.version         = "0.0.3"
  
   s.authors         = ["Marc-Andre Cournoyer", "Andrew Stewart"]
   s.email           = "boss@airbladesoftware.com"
@@ -14,4 +14,5 @@ Gem::Specification.new do |s|
   
   s.add_dependency  "aws-s3"
   s.add_dependency  "lockfile"
+  s.add_dependency  "terminator"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: airblade-mysql_s3_backup
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 +01:00
+date: 2010-08-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -34,14 +37,30 @@ dependencies:
   name: lockfile
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: terminator
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: boss@airbladesoftware.com
 executables: 
@@ -51,6 +70,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- airblade-mysql_s3_backup-0.0.3.gem
 - bin/mysql_s3_backup
 - config/sample.yml
 - lib/mysql_s3_backup/backup.rb
@@ -78,23 +98,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple backup script for Mysql and S3 with incremental backups.