myreplicator 1.1.17 → 1.1.18

data/app/models/myreplicator/log.rb

@@ -91,7 +91,30 @@ module Myreplicator
       
       return false
     end
+    
+    ##
+    # Clear all logs marked running that have run for more than 2 hours
+    ##
+    def self.clear_stucks
+      runnings = Log.where(:state => "running")
+      news = Log.where(:state => "new")
+      logs = runnings + news
+      
+      if logs.count > 0
+        logs.each do |log|
+          time_start = log.started_at
+          now = Time.now()
+          if time_start + 2.hour < now
+            Process.kill('KILL', log.pid)
+            log.state = "killed"
+            log.save!
+          end
+        end
+      end
+      
+    end
 
+    
     ##
     # Clear all logs marked running that are not running
     ##
@@ -101,7 +124,7 @@ module Myreplicator
       if logs.count > 0
         logs.each do |log|
           begin
-            Process.getpgid(log.pid) if hostname == Socket.gethostname
+            Process.getpgid(log.pid) if log.hostname == Socket.gethostname
           rescue Errno::ESRCH
             log.mark_dead
           end

data/app/models/myreplicator/sweeper.rb

@@ -0,0 +1,18 @@
+require "log"
+
+module Myreplicator
+  class Sweeper
+   
+    @queue = :myreplicator_sweeper # Provided for Resque
+    
+    ##
+    # Main method provided for resque
+    # Reconnection provided for resque workers
+    ##
+    def self.perform
+      Myreplicator::Log.clear_deads
+      Myreplicator::Log.clear_stucks
+    end
+    
+  end
+end

data/lib/myreplicator/version.rb

@@ -1,3 +1,3 @@
 module Myreplicator
-  VERSION = "1.1.17"
+  VERSION = "1.1.18"
 end

data/lib/transporter/transporter.rb

@@ -112,7 +112,7 @@ module Myreplicator
               end
             end
           end #if
-          puts "#{Thread.current.to_s}___Exiting download..."
+          #puts "#{Thread.current.to_s}___Exiting download..."
         end
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myreplicator
 version: !ruby/object:Gem::Version
-  version: 1.1.17
+  version: 1.1.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -203,6 +203,7 @@ files:
 - app/helpers/myreplicator/exports_helper.rb
 - app/models/myreplicator/export.rb
 - app/models/myreplicator/log.rb
+- app/models/myreplicator/sweeper.rb
 - app/models/myreplicator/vertica_export.rb
 - app/views/layouts/myreplicator/application.html.erb
 - app/views/myreplicator/exports/_form.html.erb
@@ -356,7 +357,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2747593640282198801
+      hash: -2961374731451743884
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -365,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2747593640282198801
+      hash: -2961374731451743884
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24