Drop rinda_ring_finger_patch

sporkrb · Apr 4, 2016 · 3f09725 · 3f09725
1 parent e576cc9
commit 3f09725
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 33 deletions.
diff --git a/lib/spork/run_strategy/magazine.rb b/lib/spork/run_strategy/magazine.rb
@@ -17,7 +17,6 @@
 
 $:.unshift(File.dirname(__FILE__))
 require 'magazine/magazine_slave'
-require 'magazine/rinda_ring_finger_patch' if RUBY_VERSION > '1.9.1'
 
 class Spork::RunStrategy::Magazine < Spork::RunStrategy
 
@@ -69,11 +68,11 @@ def spawn_process(app)
       # jruby 1.8 has no easy way to just spawn, so use a thread
       Dir.chdir(@path) do
         io = IO.popen app
-        Thread.new { puts io.read }        
+        Thread.new { puts io.read }
         return io.pid
       end
     end
-    
+
     if RUBY_VERSION < '1.9.1'
       Process.create( :app_name => app, :cwd => @path ).process_id
     else
@@ -120,10 +119,10 @@ def kill_slave(pid)
       Process.kill(9, pid)
     end
   end
-  
+
   def kill_all_processes
 
-    @pids.each {|pid| 
+    @pids.each {|pid|
       kill_slave(pid)
     }
     puts "\nKilling processes."; $stdout.flush

diff --git a/lib/spork/run_strategy/magazine/magazine_slave_provider.rb b/lib/spork/run_strategy/magazine/magazine_slave_provider.rb
@@ -1,7 +1,6 @@
 # magazine_slave_provider.rb
 require 'drb'
 require 'rinda/ring'
-require './rinda_ring_finger_patch' if RUBY_VERSION > '1.9.1' && RUBY_VERSION < '2.0.0'
 require 'rinda/tuplespace'
 require './magazine_slave'
 

diff --git a/lib/spork/run_strategy/magazine/rinda_ring_finger_patch.rb b/lib/spork/run_strategy/magazine/rinda_ring_finger_patch.rb
diff --git a/lib/spork/run_strategy/magazine/ring_server.rb b/lib/spork/run_strategy/magazine/ring_server.rb
@@ -1,6 +1,5 @@
 # ring_server.rb
 require 'rinda/ring'
-require './rinda_ring_finger_patch' if RUBY_VERSION > '1.9.1' && RUBY_VERSION < '2.0.0'
 require 'rinda/tuplespace'
 
 DRb.start_service