new_backup 1.0.3 → 1.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    new_backup (1.0.3)
+    new_backup (1.0.4)
       RunIt
       dogapi
       fog

data/lib/new_backup/datadog.rb

@@ -59,7 +59,7 @@ module NewBackup
     def api_key=(api_key)
       $dogger ||= DataDogger.new
       $dogger.api_key=api_key
-      debug "#{self.class}##{__method__}@#{__LINE__}: $dogger.api_key: #{$dogger.api_key}"
+      debug "#{self.class}##{__method__}@#{File.basename(__FILE__)}:#{__LINE__}: $dogger.api_key: #{$dogger.api_key}"
     end
 
     def dogger(msg, options={})
@@ -71,12 +71,12 @@ module NewBackup
       else
         info msg
       end
-      debug "#{self.class}##{__method__}@#{__LINE__}: $dogger exists? #{$dogger.inspect}"
-      debug "#{self.class}##{__method__}@#{__LINE__}: $dogger.api_key: #{$dogger.api_key}"
+      debug "#{self.class}##{__method__}@#{File.basename(__FILE__)}:#{__LINE__}: $dogger exists? #{$dogger.inspect}"
+      debug "#{self.class}##{__method__}@#{File.basename(__FILE__)}:#{__LINE__}: $dogger.api_key: #{$dogger.api_key}"
       return if $dogger.api_key.nil? || $dogger.api_key.empty?
       
       $dogger.client ||= Dogapi::Client.new($dogger.api_key)
-      debug "#{self.class}##{__method__}@#{__LINE__}: $dogger.client: #{$dogger.client.inspect}"
+      debug "#{self.class}##{__method__}@#{File.basename(__FILE__)}:#{__LINE__}: $dogger.client: #{$dogger.client.inspect}"
 
       $dogger.environment ||= (ENV['RAILS_ENV'].nil? || ENV['RAILS_ENV'].empty?) ? 'development' : ENV['RAILS_ENV']
 
@@ -93,7 +93,7 @@ module NewBackup
       body = options[:body] ||= msg
 
       this_event = Dogapi::Event.new(body, emit_options)
-      debug "#{self.class}##{__method__}@#{__LINE__}: emit_options: #{emit_options.to_yaml}\nbody: #{body}\nthis_event: #{this_event.inspect}"
+      debug "#{self.class}##{__method__}@#{File.basename(__FILE__)}:#{__LINE__}: emit_options: #{emit_options.to_yaml}\nbody: #{body}\nthis_event: #{this_event.inspect}"
       $dogger.client.emit_event(this_event)
 
     end

data/lib/new_backup/main.rb

@@ -42,7 +42,7 @@ module NewBackup
     # Initialize the Main loop, processing options and putting them in the right form
     def initialize(opts={})
 
-      debug "#{self.class}##{__method__}:#{__LINE__}: original opts: #{opts.to_yaml}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: original opts: #{opts.to_yaml}"
 
       if opts["config_file"] && File.exists?(opts["config_file"])
         converged_opts = DEFAULT_OPTIONS.merge(YAML.load(File.read(opts["config_file"]))).merge(opts)
@@ -52,7 +52,7 @@ module NewBackup
 
       converged_opts["timestamp"] = Time.now.strftime(converged_opts["timestamp_format"])
       
-      debug "#{self.class}##{__method__}:#{__LINE__}: converged_opts: #{converged_opts.to_yaml}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: converged_opts: #{converged_opts.to_yaml}"
 
       missing_options = REQUIRED_OPTIONS.select {|o| o unless converged_opts.has_key?(o)}
       raise "Missing required options #{missing_options.inspect} in either configuration or command line" if missing_options.count > 0
@@ -94,8 +94,7 @@ module NewBackup
         :nos3           => converged_opts["nos3"]
       }
 
-      
-      debug "Options:\n#{@options.to_yaml}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: Options:\n#{@options.to_yaml}"
 
       # Fill in the hidden values after showing the options
       @options[:aws][:access_key]   = converged_opts["aws_access_key_id"]
@@ -103,11 +102,9 @@ module NewBackup
       @options[:mysql][:password]   = converged_opts["mysql_password"]
       @options[:datadog][:api_key]  = converged_opts["datadog_apikey"]
 
-      debug @options.to_yaml
-
       $dogger = DataDogger.new
       $dogger.api_key=@options[:datadog][:api_key] unless @options[:debug]
-      debug "#{self.class}##{__method__}@#{__LINE__}: $dogger.api_key: #{$dogger.api_key}"
+      debug "#{self.class}##{__method__}@#{File.basename(__FILE__)}:#{__LINE__}: $dogger.api_key: #{$dogger.api_key}"
 
     end
 
@@ -115,13 +112,13 @@ module NewBackup
       dogger "Beginning RDS-S3-Backup"
       begin
         
-        raise "#{self.class}##{__method__}:#{__LINE__}: Dump directory #{@options[:dump_directory]} does not exist!" unless File.directory?(@options[:dump_directory])
+        raise "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: Dump directory #{@options[:dump_directory]} does not exist!" unless File.directory?(@options[:dump_directory])
 
 
         raw_file = File.join(File.expand_path(@options[:dump_directory]),save_file_name)
-        debug "#{self.class}##{__method__}:#{__LINE__}: raw_file: #{raw_file}"
+        debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: raw_file: #{raw_file}"
         clean_file = File.join(File.expand_path(@options[:dump_directory]),clean_file_name)
-        debug "#{self.class}##{__method__}:#{__LINE__}: clean_file: #{clean_file}"
+        debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: clean_file: #{clean_file}"
 
         if (@options[:nords])
           info "Not running RDS"
@@ -134,11 +131,8 @@ module NewBackup
         else
 
           NewBackup::MyRds.new(@options).restore do |db|
-            info "Dump raw database"
             db.dump(raw_file)
-            info "Obfuscate database"
             db.obfuscate
-            info "Dump clean database"
             db.dump(clean_file)
           end
         end
@@ -150,14 +144,11 @@ module NewBackup
           s3 = NewBackup::MyS3.new(@options)
           s3.connect do |connection|
             s3.connect_bucket(connection, @options[:s3][:raw_bucket]) do |bucket|
-              info "Save raw db dump"
               s3.put_file bucket, raw_file
-              info "Prune excess backups"
               s3.prune bucket, @options[:s3][:dump_ttl]
             end
             
             s3.connect_bucket(connection, @options[:s3][:clean_bucket]) do |bucket|
-              info "Save cleaned db dump"
               s3.put_file bucket, clean_file
             end
           end
@@ -168,7 +159,7 @@ module NewBackup
         dogger "Fatal error in #{self.class}#run: #{e.class}: #{e}" ,
         :type => :error,
         :body => "Backtrace:\n#{e.backtrace.join("\n")}"
-        debug e.backtrace.join("\n")
+        debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: Backtrace:\n #{e.backtrace.join("\n")}"
         raise e
 
 

data/lib/new_backup/myrds.rb

@@ -25,7 +25,7 @@ module NewBackup
 
     # Initialize the class with options
     def initialize(options={})
-      debug "Options: #{options}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: Options: #{options}"
       @options = options
     end
 
@@ -62,8 +62,7 @@ module NewBackup
 
     # Get the RDS server
     def get_rds(connection)
-      debug "rds instance_id: #{@options[:rds][:instance_id]}"
-      debug "Connection servers: #{connection.servers}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: rds instance_id: #{@options[:rds][:instance_id]}\nConnection servers: #{connection.servers}"
       rds_server = connection.servers.get(@options[:rds][:instance_id])
       raise "No RDS server!" if rds_server.nil?
       yield rds_server
@@ -76,7 +75,7 @@ module NewBackup
         rds_server.snapshots.new(:id => snap_name).save
         new_snapshot = rds_server.snapshots.get(snap_name)
         1.upto(MAX_TRIES) do |i|
-          debug "waiting for new snapshot, try ##{i}"
+          debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: waiting for new snapshot, try ##{i}"
           new_snapshot.wait_for { ready? }
         end
         
@@ -100,7 +99,7 @@ module NewBackup
                                                )
         backup_server = connection.servers.get(backup_server_id)
         1.upto(MAX_TRIES) do |i|
-          debug "waiting for backup server, try ##{i}"
+          debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: waiting for backup server, try ##{i}"
           backup_server.wait_for { ready? }
         end
 
@@ -124,12 +123,16 @@ module NewBackup
 
     # Return the snapshot name
     def snap_name
-      "s3-dump-snap-#{@options[:timestamp]}".tap{|t| debug "Snap Name: #{t}"}
+      "s3-dump-snap-#{@options[:timestamp]}".tap do |t|
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: Snap Name: #{t}"
+      end
     end
 
     # Return the backup server id
     def backup_server_id
-      "#{@options[:rds][:instance_id]}-s3-dump-server-#{@options[:timestamp]}".tap{|t| debug "Backup Server ID: #{t}"}
+      "#{@options[:rds][:instance_id]}-s3-dump-server-#{@options[:timestamp]}".tap do |t|
+        debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: Backup Server ID: #{t}"
+      end
     end
 
 

data/lib/new_backup/mys3.rb

@@ -56,7 +56,8 @@ module NewBackup
     # *&block*:: block passed to evaluate in context of bucket
     # (If no block given simply return the bucket pointer.)
     def connect_bucket(connection, bucket_name, &block)
-      debug "#{self.class}##{__method__}:#{__LINE__}: connection: #{connection.inspect}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: connection: #{connection.inspect}"
+      info "Connecting to #{bucket_name}"
       buckets = connection.directories
       raise "No buckets!" if buckets.nil? || buckets.empty?
       bucket = connection.directories.get(bucket_name)
@@ -79,6 +80,7 @@ module NewBackup
     # bucket:: directory where to put the file
     # fn:: name of file to upload (gzipped)
     def put_file(bucket,fn)
+      info "Saving #{fn} to #{bucket.key}"
       s3_fn = File.join(@options[:s3][:prefix], File.basename(fn))
       options = {
         :key => s3_fn,
@@ -105,6 +107,7 @@ module NewBackup
         return if files.nil? || files.empty?
 
         if files.count > keep
+          info "Pruning down to #{keep} files"
           files.sort {|x,y| x.last_modified <=> y.last_modified}.
             take(files.count - keep).
             map(&:destroy)

data/lib/new_backup/mysqlcmds.rb

@@ -39,7 +39,7 @@ module NewBackup
         :gzip		=> get_command('gzip')
       }
 
-      debug "#{self.class}##{__method__}:#{__LINE__}: @commands: #{@commands}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: @commands: #{@commands}"
 
     end
 
@@ -55,12 +55,13 @@ module NewBackup
       cmd << ">"
       cmd << save_file
  
-      debug "#{self.class}##{__method__}:#{__LINE__}: cmd = #{cmd.join(" ")}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: cmd = #{cmd.join(" ")}"
 
       saver = RunIt.new cmd.join(" ")
+      info "dumping #{self.database} to #{save_file}"
       saver.run
       raise "#{self.class}#save error: #{saver.result.exitstatus}: #{saver.error.inspect}" unless saver.result.success?
-      debug "#{self.class}##{__method__}:#{__LINE__}: saver.output: #{saver.output}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: saver.output: #{saver.output}"
     end
 
     def obfuscate
@@ -74,11 +75,12 @@ module NewBackup
       cmd << "<"
       cmd << self.obfuscate_script
 
-      debug "#{self.class}##{__method__}:#{__LINE__}: cmd= #{cmd.join(" ")}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: cmd= #{cmd.join(" ")}"
       obfuscator = RunIt.new cmd.join(" ")
+      info "Running #{self.obfuscate_script} on #{self.database}"
       obfuscator.run
-      raise "#{self.class}##{__method__}:#{__LINE__}: error: #{obfuscator.result.exitstatus}: #{obfuscator.error.inspect}" unless obfuscator.result.success?
-      debug "#{self.class}##{__method__}:#{__LINE__}: obfuscator.output: #{obfuscator.output}"
+      raise "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: error: #{obfuscator.result.exitstatus}: #{obfuscator.error.inspect}" unless obfuscator.result.success?
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: obfuscator.output: #{obfuscator.output}"
     end
 
 

data/lib/new_backup/version.rb

@@ -11,7 +11,7 @@
 
 
 module NewBackup
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
   DESCRIPTION = "Backup an RDS database instance to S3, and create and obfuscated version"
   SUMMARY = DESCRIPTION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: new_backup
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1819741959940293617
+      hash: 1620806548271440799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1819741959940293617
+      hash: 1620806548271440799
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24