lib/new_backup/mysqlcmds.rb in new_backup-1.0.3 vs lib/new_backup/mysqlcmds.rb in new_backup-1.0.4

@@ -37,11 +37,11 @@
         {:mysqldump  	=> get_command('mysqldump'),
         :mysql      	=> get_command('mysql'),
         :gzip		=> get_command('gzip')
       }
 
-      debug "#{self.class}##{__method__}:#{__LINE__}: @commands: #{@commands}"
+      debug "#{self.class}##{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: @commands: #{@commands}"
 
     end
 
     def dump(save_file)
       cmd = []
@@ -53,16 +53,17 @@
       cmd << "|"
       cmd << @commands[:gzip]
       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
 
       cmd = []
@@ -72,14 +73,15 @@
       cmd << "--password=#{self.password}" unless self.password.nil? or self.password.empty?
       cmd << self.database
       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
 
 
     private