lib/restore.rb in mogbak-0.1.2 vs lib/restore.rb in mogbak-0.2.0

@@ -26,21 +26,22 @@
     require('fileclass')
   end
 
   def output_save(save, fid)
     if save
-      puts "Restored: FID #{fid}"
+      Log.instance.info("Restored: FID #{fid}")
     else
-      puts "Error: FID #{fid}"
+      Log.instance.info("Error: FID #{fid}")
     end
   end
 
   def launch_restore_workers(files)
     child = Proc.new { |files|
       results = []
       files.each do |file|
         break if file.nil?
+        break if SignalHandler.instance.should_quit
         save = file.restore
         output_save(save, file.fid)
         results << {:restored => save, :fid => file.fid}
       end
       results
@@ -62,9 +63,10 @@
       output_save(save, file.fid)
     else
 
       BakFile.find_in_batches(:conditions => ['saved = ?', true], :batch_size => 2000) do |batch|
         launch_restore_workers(batch)
+        break if SignalHandler.instance.should_quit
       end
 
     end
   end
 end
\ No newline at end of file