myreplicator 1.0.2 → 1.0.3

data/app/models/myreplicator/export.rb

@@ -36,18 +36,20 @@ module Myreplicator
     ##
     def self.perform(export_id, *args)
       options = args.extract_options!
+      ActiveRecord::Base.verify_active_connections!
+      ActiveRecord::Base.connection.reconnect!
       export_obj = Export.find(export_id)
-      export_obj.export_table
-    end
-
-    ##
-    # Runs the export process using the required Exporter library
-    ##
-    def export_table
-      Log.run(:job_type => "export", :name => schedule_name, 
+      export_obj.export
+     end
+
+     ##
+     # Runs the export process using the required Exporter library
+     ##
+     def export
+       Log.run(:job_type => "export", :name => schedule_name, 
               :file => filename, :export_id => id) do |log|
         exporter = MysqlExporter.new
-        exporter.export_table self    
+        exporter.export_table self # pass current object to exporter
       end
     end
 

data/app/models/myreplicator/log.rb

@@ -59,8 +59,12 @@ module Myreplicator
     def kill
       begin
         Process.kill('TERM', pid)
+        self.state = "killed"
+        self.save!
       rescue Errno::ESRCH
         puts "pid #{pid} does not exist!"
+        self.state = "dead-pid"
+        self.save!
       end
     end
 

data/lib/myreplicator/version.rb

@@ -1,3 +1,3 @@
 module Myreplicator
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/transporter/parallelizer.rb

@@ -29,17 +29,16 @@ module Myreplicator
     def run
       @done = false
       @manager_running = false
+      reaper = nil
 
       while @queue.size > 0
         if @threads.size <= @max_threads
           @threads << Thread.new(@queue.pop) do |proc|
-            Thread.current[:status] = 'running' # Manually Set Thread state for Checks
             @klass.new.instance_exec(proc[:params], &proc[:block])
-            Thread.current[:status] = 'done' 
           end
         else
           unless @manager_running
-            manage_threads 
+            reaper = manage_threads 
             @manager_running = true
           end
           sleep 1
@@ -47,14 +46,11 @@ module Myreplicator
       end   
       
       # Run manager if thread size never reached max
-      manage_threads unless @manager_running
+      reaper = manage_threads unless @manager_running
 
       # Waits until all threads are completed
       # Before exiting
-      while !done?
-        sleep 1
-      end
-
+      reaper.join
     end
     
     ##
@@ -67,9 +63,8 @@ module Myreplicator
         while(@threads.size > 0)
           done = []
           @threads.each do |t|
-            done << t if t[:status] == "done"
+            done << t if t.stop?
           end
-
           done.each{|d| @threads.delete(d)} # Clear dead threads
           
           # If no more jobs are left, mark done

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myreplicator
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -344,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2633228139332231140
+      hash: -2453224116345445588
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2633228139332231140
+      hash: -2453224116345445588
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23