redis-spawn 0.1.0 → 0.1.1

data/Rakefile

@@ -6,6 +6,7 @@ require 'redis/spawn'
 task :test do
   require 'cutest'
   
+  PROCESS_PID = Process.pid.to_s
   Cutest.run(Dir["./test/**/*_test.rb"])
 end
 

data/lib/redis/spawn.rb

@@ -119,7 +119,7 @@ class Redis
    
       # Make sure we clean up after our children and avoid a zombie invasion
       trap("CLD") do
-        pid = Process.wait
+        pid = Process.wait(-1, Process::WNOHANG)
       end
 
       # Start the server
@@ -129,6 +129,7 @@ class Redis
       at_exit do
         # Maybe make this configurable to allow the server to continue after exit
         self.shutdown!
+        Process.wait(@pid,  Process::WNOHANG) if (@pid && @pid != 0)
       end
       
       self.pid

data/lib/redis/spawn/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class SpawnServer
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/test/build_config_test.rb

@@ -1,4 +1,3 @@
-require File.expand_path("./build_config_helper", File.dirname(__FILE__))
 require File.expand_path("./helper", File.dirname(__FILE__))
 
 test "build_config_line" do
@@ -12,25 +11,36 @@ setup do
   @test_config_defaults = <<TEST_CONF_END
 port 0
 bind 127.0.0.1
-unixsocket /tmp/redis-spawned.0.sock
+unixsocket /tmp/redis-spawned.#{PROCESS_PID}.sock
 loglevel notice
-logfile /tmp/redis-spawned.0.log
+logfile /tmp/redis-spawned.#{PROCESS_PID}.log
+timeout 0
 databases 16
 save 900 1
 save 300 10
 save 60 10000
+stop-writes-on-bgsave-error yes
 rdbcompression yes
+rdbchecksum yes
 dbfilename dump.rdb
-dir /tmp/redis-spawned.0.data
+dir /tmp/redis-spawned.#{PROCESS_PID}.data
 appendonly no
 appendfsync everysec
-vm-enabled no
-hash-max-zipmap-entries 512
-hash-max-zipmap-value 64
+no-appendfsync-on-rewrite no
+lua-time-limit 5000
+slowlog-log-slower-than 10000
+slowlog-max-len 128
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
 list-max-ziplist-entries 512
 list-max-ziplist-value 64
 set-max-intset-entries 512
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
 activerehashing yes
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
 TEST_CONF_END
 end
 
@@ -39,29 +49,40 @@ test "build_config with defaults" do
 end
 
 setup do
-  @test_config_defaults = <<TEST_CONF_END
+  @test_config_overrides = <<TEST_CONF_END
 port 0
 bind 127.0.0.1
 unixsocket /tmp/redis-spawned.override.sock
 loglevel notice
 logfile /tmp/redis-spawned.override.log
+timeout 0
 databases 8
 save 900 1
 save 300 10
 save 100 1000
 save 60 10000
+stop-writes-on-bgsave-error yes
 rdbcompression no
+rdbchecksum yes
 dbfilename dump.rdb
 dir /tmp/redis-spawned.override.data
 appendonly no
 appendfsync everysec
-vm-enabled no
-hash-max-zipmap-entries 512
-hash-max-zipmap-value 64
+no-appendfsync-on-rewrite no
+lua-time-limit 5000
+slowlog-log-slower-than 10000
+slowlog-max-len 128
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
 list-max-ziplist-entries 512
 list-max-ziplist-value 64
 set-max-intset-entries 512
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
 activerehashing yes
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
 TEST_CONF_END
 end
   
@@ -74,7 +95,7 @@ test "build_config with overrides" do
     rdbcompression: "no",
     dir:            "/tmp/redis-spawned.override.data"
   }
-  assert @test_config_defaults == Redis::SpawnServer.new(start: false, server_opts: overrides).build_config
+  assert @test_config_overrides == Redis::SpawnServer.new(start: false, server_opts: overrides).build_config
 end
 
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-spawn
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -59,7 +59,6 @@ files:
 - test/write_config_test.rb
 - test/helper.rb
 - test/spawn_test.rb
-- test/build_config_helper.rb
 - test/build_config_test.rb
 homepage: http://github.com/lichp/redis-spawn
 licenses: []

data/test/build_config_helper.rb

@@ -1,14 +0,0 @@
-# Monkeypatch Process to allow for consistent value of Process.pid in tests
-module Process
-  class << self
-    alias :redis_spawn_original_pid :pid
-  
-    def pid
-      if caller[0] =~ /redis\/spawn/
-        return 0
-      else
-        return redis_spawn_original_pid
-      end
-    end
-  end
-end