serverengine 2.0.0pre2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0624473f82b51ace3b39db1d685218fc18a453d7
-  data.tar.gz: a416727fa4596bc181953c34d0e65cc15b1442f4
+  metadata.gz: 4f113bd0243d7ab01e1ee3256f159ca24e3fcaaf
+  data.tar.gz: 98700347259e4cdd7884fd86b4875944ad6f922d
 SHA512:
-  metadata.gz: 72971d1ba56510aa6df7a65ab4c4fa0e7ba010a3549e4fe26d2c049d07b88c8bb41aa167ee3b82a6f7f49e870346967efe3134c821be71d824296d25c271a9de
-  data.tar.gz: 3eac8fe2391574de2b97a904c64f772d63292b17f95838afe184f5cd763141e8141ff548e21de8ad1fac0112a6e55dd979109572189d9017ddc043357e9bdae3
+  metadata.gz: 602df54ace3a99dff2557c4bf450cf57528dc8f080c0b1674c77978074620320ca8dec4a1f0c351c09e9731cf8fbf8dc7a2152736d4e90169e00141eb805dee6
+  data.tar.gz: bac416916a5270e51bf4cc39cc34c697e86d33821597b93d832d865ad2edcddc39a827ed9659ad14b02ac0c5af7870c2972d00e887adc511e6625333d9e9dd2f

data/lib/serverengine/daemon.rb

@@ -52,7 +52,6 @@ module ServerEngine
       @chumask = @config[:chumask]
 
       @pid = nil
-      @command_pipe = @config.fetch(:command_pipe, nil)
       @command_sender = @config.fetch(:command_sender, ServerEngine.windows? ? "pipe" : "signal")
       if @command_sender == "pipe"
         extend ServerEngine::CommandSender::Pipe

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "2.0.0pre2"
+  VERSION = "2.0.0"
 end

data/spec/multi_spawn_server_spec.rb

@@ -0,0 +1,26 @@
+require 'timeout'
+
+describe ServerEngine::MultiSpawnServer do
+  include_context 'test server and worker'
+
+  context 'with command_sender=pipe' do
+    it 'starts worker processes' do
+      config = {workers: 2, command_sender: 'pipe', log_stdout: false, log_stderr: false}
+
+      s = ServerEngine::MultiSpawnServer.new(TestWorker) { config.dup }
+      t = Thread.new { s.main }
+
+      begin
+        wait_for_fork
+
+        Timeout.timeout(5) do
+          sleep(0.5) until test_state(:worker_run) == 2
+        end
+        test_state(:worker_run).should == 2
+      ensure
+        s.stop(true)
+        t.join
+      end
+    end
+  end
+end

data/spec/server_worker_context.rb

@@ -151,7 +151,7 @@ end
 module TestWorker
   def initialize
     incr_test_state :worker_initialize
-    @stop_flag = BlockingFlag.new
+    @stop_flag = ServerEngine::BlockingFlag.new
   end
 
   def before_fork
@@ -180,6 +180,36 @@ module TestWorker
   def after_start
     incr_test_state :worker_after_start
   end
+
+  def spawn(pm)
+    script = <<-EOF
+    class WorkerClass
+      include TestWorker
+      def run
+        Thread.new do
+          command_pipe = STDIN.dup
+          STDIN.reopen(File::NULL)
+          Thread.new do
+            until @stop_flag.set?
+              cmd = command_pipe.gets.chomp
+              case cmd
+              when "GRACEFUL_STOP", "IMMEDIATE_STOP"
+                stop
+              when "RELOAD"
+                reload
+              end
+            end
+          end
+        end
+        super
+      end
+    end
+    $state_file_mutex = Mutex.new
+    WorkerClass.new.run
+    EOF
+    cmdline = [ServerEngine.ruby_bin_path] + %w[-rbundler/setup -rrspec -I. -Ispec -rserverengine -r] + [__FILE__] + %w[-e] + [script]
+    pm.spawn(*cmdline)
+  end
 end
 
 module RunErrorWorker

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 2.0.0pre2
+  version: 2.0.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
@@ -128,6 +128,7 @@ files:
 - spec/daemon_logger_spec.rb
 - spec/daemon_spec.rb
 - spec/multi_process_server_spec.rb
+- spec/multi_spawn_server_spec.rb
 - spec/server_worker_context.rb
 - spec/signal_thread_spec.rb
 - spec/socket_manager_spec.rb
@@ -148,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -162,6 +163,7 @@ test_files:
 - spec/daemon_logger_spec.rb
 - spec/daemon_spec.rb
 - spec/multi_process_server_spec.rb
+- spec/multi_spawn_server_spec.rb
 - spec/server_worker_context.rb
 - spec/signal_thread_spec.rb
 - spec/socket_manager_spec.rb