myreplicator 1.0.5 → 1.0.6

data/app/models/myreplicator/log.rb

@@ -25,7 +25,7 @@ module Myreplicator
                              :pid => Process.pid,
                              :hostname => Socket.gethostname,
                              :guid => SecureRandom.hex(5),
-                             :thread_state => Thread.current.status,
+                             :thread_state => Thread.current.to_s,
                              :state => "new")
 
       log = Log.create options
@@ -45,7 +45,6 @@ module Myreplicator
 
         ensure
           log.finished_at = Time.now
-          log.thread_state = Thread.current.status
           log.save!
         end
       end

data/lib/myreplicator/version.rb

@@ -1,3 +1,3 @@
 module Myreplicator
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/transporter/parallelizer.rb

@@ -34,8 +34,10 @@ module Myreplicator
       while @queue.size > 0
         if @threads.size <= @max_threads
           @threads << Thread.new(@queue.pop) do |proc|
+            Thread.current[:thread_state] = "running"
             @klass.new.instance_exec(proc[:params], &proc[:block])
-          end
+            Thread.current[:thread_state] = "done"
+          end       
         else
           unless @manager_running
             reaper = manage_threads 
@@ -63,7 +65,9 @@ module Myreplicator
         while(@threads.size > 0)
           done = []
           @threads.each do |t|
-            done << t if t.stop?
+            done << t if t[:thread_state] == "done" || !t.status
+            # puts t.object_id.to_s + "--" + t.status.to_s + "--" + t.to_s
+            # raise "Nil Thread State" if t[:thread_state].nil?
           end
           done.each{|d| @threads.delete(d)} # Clear dead threads
           
@@ -72,6 +76,7 @@ module Myreplicator
           if done?
             @done = true
           else
+            puts "Sleeping for 2"
             sleep 2 # Wait for more threads to spawn
           end
 

data/lib/transporter/transporter.rb

@@ -51,20 +51,19 @@ module Myreplicator
     # Kicks off parallel download
     ##
     def self.download export
-      ssh = export.ssh_to_source     
-      parallel_download(export, ssh, completed_files(ssh, export))
+      parallel_download(export, completed_files(export))
     end
 
     ##
     # Gathers all files that need to be downloaded
     # Gives the queue to parallelizer library to download in parallel
     ##
-    def self.parallel_download export, ssh, files    
+    def self.parallel_download export, files    
       p = Parallelizer.new(:klass => "Myreplicator::Transporter")
 
       files.each do |filename|
         puts filename
-        p.queue << {:params =>[ssh, export, filename], :block => download_file}
+        p.queue << {:params =>[export, filename], :block => download_file}
       end
 
       p.run 
@@ -80,15 +79,14 @@ module Myreplicator
     ##
     def self.download_file    
       proc = Proc.new { |params|
-        ssh = params[0]
-        export = params[1] 
-        filename = params[2]
+        export = params[0] 
+        filename = params[1]
 
         ActiveRecord::Base.verify_active_connections!
         ActiveRecord::Base.connection.reconnect!
 
         Log.run(:job_type => "transporter", :name => "metadata_file", 
-                :file => filename, :export_id => export.id) do |log|
+                :file => filename, :export_id => export.id ) do |log|
 
           sftp = export.sftp_to_source
           json_file = Transporter.remote_path(export, filename) 
@@ -103,12 +101,10 @@ module Myreplicator
                     :file => dump_file, :export_id => export.id) do |log|
               puts "Downloading #{dump_file}"
               sftp.download!(dump_file, File.join(tmp_dir, dump_file.split("/").last))
-              Transporter.remove!(ssh, json_file, dump_file)
+              Transporter.remove!(export, json_file, dump_file)
             end
-          elsif Transporter.junk_file?(metadata)
-            Transporter.remove!(ssh, json_file, dump_file)
           end #if
-
+          puts "#{Thread.current.to_s}___Exiting download..."
         end
       }
     end
@@ -126,15 +122,17 @@ module Myreplicator
       return false
     end
 
-    def self.remove! ssh, json_file, dump_file
-      ssh.exec!("rm #{json_file}")
-      ssh.exec!("rm #{dump_file}")           
+    def self.remove! export, json_file, dump_file
+      ssh = export.ssh_to_source
+      puts "rm #{json_file} #{dump_file}"
+      ssh.exec!("rm #{json_file} #{dump_file}")
     end
 
     ##
     # Gets all files ready to be exported from server
     ##
-    def self.completed_files ssh, export
+    def self.completed_files export
+      ssh = export.ssh_to_source
       done_files = ssh.exec!(get_done_files(export))
 
       unless done_files.blank?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myreplicator
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -347,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4098853574664925897
+      hash: 1776546656484896019
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -356,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4098853574664925897
+      hash: 1776546656484896019
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23