redis_ring 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -2,12 +2,14 @@ PATH
   remote: .
   specs:
     redis_ring (0.0.1)
+      daemons-mikehale
       json
       sinatra
 
 GEM
   remote: http://rubygems.org/
   specs:
+    daemons-mikehale (1.0.14)
     diff-lcs (1.1.2)
     json (1.5.1)
     mocha (0.9.12)
@@ -20,7 +22,7 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    sinatra (1.1.3)
+    sinatra (1.2.0)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     tilt (1.2.2)

data/lib/monkey_patches.rb

@@ -0,0 +1,9 @@
+if File.directory?("/proc")
+  class Daemons::Pid
+
+    def self.running?(pid)
+      return File.exist?("/proc/#{pid}")
+    end
+
+  end
+end

data/lib/redis_ring/application.rb

@@ -2,10 +2,11 @@ module RedisRing
 
   class Application
 
-    attr_reader :shards, :configuration
+    attr_reader :shards, :configuration, :process_manager
 
     def initialize(configuration)
       @configuration = configuration
+      @process_manager = ProcessManager.new
       @shards = {}
     end
 
@@ -18,14 +19,19 @@ module RedisRing
       end
 
       @shards.each do |shard_no, shard|
-        shard.start
+        @process_manager.start_shard(shard)
       end
+
+      @process_manager.run
     end
 
     def stop
+      @process_manager.halt
+
       @shards.each do |shard_no, shard|
-        shard.stop
+        @process_manager.stop_shard(shard)
       end
+
       @shards = {}
     end
 

data/lib/redis_ring/cli.rb

@@ -46,6 +46,8 @@ USAGE
       Application.instance.start
 
       WebInterface.run!(:port => config.base_port)
+
+      Application.instance.stop
     end
 
   end

data/lib/redis_ring/process_manager.rb

@@ -0,0 +1,55 @@
+module RedisRing
+
+  class ShardAlreadyStarted < StandardError; end
+
+  class ProcessManager
+
+    def initialize
+      @shards = {}
+    end
+
+    def run
+      @continue_running = true
+      Thread.new do
+        monitor_processes_loop
+      end
+    end
+
+    def halt
+      @continue_running = false
+    end
+
+    def start_shard(shard)
+      if shards.key?(shard.shard_number)
+        raise ShardAlreadyStarted.new("Shard: #{shard.shard_number} already started!")
+      end
+
+      shards[shard.shard_number] = shard
+
+      shard.start
+    end
+
+    def stop_shard(shard)
+      shards.delete(shard.shard_number)
+      shard.stop
+    end
+
+    protected
+
+    attr_reader :shards
+
+    def monitor_processes_loop
+      while(@continue_running) do
+        shards.each do |shard_no, shard|
+          unless shard.alive?
+            puts "Restarting shard #{shard_no}"
+            shard.start
+          end
+        end
+        sleep(1)
+      end
+    end
+
+  end
+
+end

data/lib/redis_ring/shard.rb

@@ -32,28 +32,30 @@ module RedisRing
     end
 
     def start
-      shard_config.save
-      @pid = fork_redis_server
-      @status = :started
+      if @status == :started
+        @task.start unless @task.running?
+      else
+        shard_config.save
+        @task = fork_redis_server
+        @status = :started
+      end
     end
 
     def stop
-      send_kill_signal
+      @task.stop
       @status = :stopped
     end
 
-    protected
-
     def alive?
-      @pid && File.exist?("/proc/#{@pid}")
+      @task && @task.running?
     end
 
-    def fork_redis_server
-      spawn(shard_config.redis_path, shard_config.config_file_name)
-    end
+    protected
 
-    def send_kill_signal
-      system("kill -QUIT #{pid}")
+    def fork_redis_server
+      Daemons.call(:multiple => true) do
+        exec(shard_config.redis_path, shard_config.config_file_name)
+      end
     end
 
   end

data/lib/redis_ring/version.rb

@@ -1,3 +1,3 @@
 module RedisRing
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/redis_ring.rb

@@ -5,10 +5,14 @@ require 'fileutils'
 
 require 'sinatra'
 require 'json'
+require 'daemons'
+
+require 'monkey_patches'
 
 require 'redis_ring/configuration'
 require 'redis_ring/shard_config'
 require 'redis_ring/shard'
 require 'redis_ring/application'
 require 'redis_ring/web_interface'
+require 'redis_ring/process_manager'
 require 'redis_ring/cli'

data/redis_ring.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'sinatra'
   s.add_dependency 'json'
+  s.add_dependency 'daemons-mikehale'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'mocha'

data/spec/redis_ring/application_spec.rb

@@ -4,7 +4,7 @@ describe RedisRing::Application do
 
   describe "#shards_hash" do
     before(:each) do
-      RedisRing::Shard.any_instance.stubs(:fork_redis_server => 123)
+      RedisRing::Shard.any_instance.stubs(:fork_redis_server => stub(:start => true, :stop => true, :running? => true))
       RedisRing::ShardConfig.any_instance.stubs(:save)
       RedisRing::ShardConfig.any_instance.stubs(:alive? => true)
 

data/spec/redis_ring/shard_spec.rb

@@ -5,9 +5,9 @@ describe RedisRing::Shard do
   describe "possible statuses" do
     before(:each) do
       @shard = RedisRing::Shard.new(RedisRing::ShardConfig.new(0, RedisRing::Configuration.new))
-      @pid = 123
+      @task = stub(:start => true, :stop => true)
       @shard.shard_config.stubs(:save)
-      @shard.stubs(:fork_redis_server => @pid)
+      @shard.stubs(:fork_redis_server => @task)
       @shard.stubs(:send_kill_signal)
     end
 
@@ -16,14 +16,14 @@ describe RedisRing::Shard do
     end
 
     it "should be running if started and alive" do
-      @shard.stubs(:alive? => true)
+      @task.stubs(:running? => true)
       @shard.start
 
       @shard.status.should == :running
     end
 
     it "should be stopping if started then stopped but still alive" do
-      @shard.stubs(:alive? => true)
+      @task.stubs(:running? => true)
       @shard.start
       @shard.stop
 
@@ -31,7 +31,7 @@ describe RedisRing::Shard do
     end
 
     it "should be stopped if started then stopped and not alive" do
-      @shard.stubs(:alive? => false)
+      @task.stubs(:running? => false)
       @shard.start
       @shard.stop
 
@@ -39,7 +39,7 @@ describe RedisRing::Shard do
     end
 
     it "should be dead if started but not alive" do
-      @shard.stubs(:alive? => false)
+      @task.stubs(:running? => false)
       @shard.start
 
       @shard.status.should == :dead

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Adam Pohorecki
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +01:00
+date: 2011-03-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: daemons-mikehale
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -54,10 +54,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -69,6 +69,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: RedisRing is a solution to run multiple small Redis instances intead of a single large one.
 email: 
 - adam@pohorecki.pl
@@ -87,10 +100,12 @@ files:
 - bin/redis-ring
 - config/redis-ring.sample.yml
 - config/redis.conf.erb
+- lib/monkey_patches.rb
 - lib/redis_ring.rb
 - lib/redis_ring/application.rb
 - lib/redis_ring/cli.rb
 - lib/redis_ring/configuration.rb
+- lib/redis_ring/process_manager.rb
 - lib/redis_ring/shard.rb
 - lib/redis_ring/shard_config.rb
 - lib/redis_ring/version.rb