myreplicator 1.1.62 → 1.1.63

data/lib/loader/loader.rb

@@ -83,11 +83,11 @@ module Myreplicator
         end
         # init load
         if metadata.export_type == "initial"
-          Myreplicator::Log.run(:job_type => "loader",
-          :name => "#{metadata.export_type}_import",
-          :file => metadata.filename,
-          :export_id => metadata.export_id) do |log|
-            if Myreplicator::Loader.transfer_completed? metadata
+          if Myreplicator::Loader.transfer_completed? metadata
+            Myreplicator::Log.run(:job_type => "loader",
+            :name => "#{metadata.export_type}_import",
+            :file => metadata.filename,
+            :export_id => metadata.export_id) do |log|
               if metadata.export_to == "vertica"
                 Myreplicator::Loader.incremental_load metadata
               else
@@ -95,21 +95,24 @@ module Myreplicator
               end
               Myreplicator::Loader.cleanup metadata
             end
+            @redis.hset(@load_hash, metadata.filepath, 1)
+          else #transporter not done yet, return the file to @load_set 
+            @redis.sadd(@load_set, metadata.filepath)
           end
-          @redis.hset(@load_hash, metadata.filepath, 1)
+          
         else #if metadata.export_type == "incremental" # incremental load
-          #1
-          Myreplicator::Log.run(:job_type => "loader",
-          :name => "incremental_import",
-          :file => metadata.filename,
-          :export_id => metadata.export_id) do |log|
-            if Myreplicator::Loader.transfer_completed? metadata
+          if Myreplicator::Loader.transfer_completed? metadata
+            Myreplicator::Log.run(:job_type => "loader",
+            :name => "incremental_import",
+            :file => metadata.filename,
+            :export_id => metadata.export_id) do |log|
               Myreplicator::Loader.incremental_load metadata
               Myreplicator::Loader.cleanup metadata
             end
+            @redis.hset(@load_hash, metadata.filepath, 1)
+          else #transporter not done yet, return the file to @load_set
+            @redis.sadd(@load_set, metadata.filepath)
           end
-          #2
-          @redis.hset(@load_hash, metadata.filepath, 1)
         end
         sleep(2)
       end # end while        

data/lib/myreplicator/version.rb

@@ -1,3 +1,3 @@
 module Myreplicator
-  VERSION = "1.1.62"
+  VERSION = "1.1.63"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myreplicator
 version: !ruby/object:Gem::Version
-  version: 1.1.62
+  version: 1.1.63
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -358,7 +358,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 372402415782592311
+      hash: -3516789411142230801
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -367,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 372402415782592311
+      hash: -3516789411142230801
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24