serverengine 1.6.4 → 2.0.0pre1

data/spec/signal_thread_spec.rb

@@ -6,84 +6,89 @@ describe ServerEngine::SignalThread do
     t.join
   end
 
-  it 'call handler' do
-    n = 0
+  unless ServerEngine.windows?
+    it 'call handler' do
+      n = 0
 
-    t = SignalThread.new do |st|
-      st.trap('CONT') { n += 1 }
-    end
-
-    Process.kill('CONT', Process.pid)
-    sleep 0.5
-
-    t.stop.join
-
-    n.should == 1
-  end
-
-  it 'SIG_IGN' do
-    # IGNORE signal handler has possible race condition in Ruby 2.1
-    # https://bugs.ruby-lang.org/issues/9835
-    # That's why ignore this test in Ruby2.1
-    if RUBY_VERSION >= '2.2'
       t = SignalThread.new do |st|
-        st.trap('QUIT', 'SIG_IGN')
+        st.trap('CONT') { n += 1 }
       end
 
-      Process.kill('QUIT', Process.pid)
+      Process.kill('CONT', Process.pid)
+      sleep 0.5
 
       t.stop.join
-    end
-  end
 
-  it 'signal in handler' do
-    n = 0
+      n.should == 1
+    end
 
-    SignalThread.new do |st|
-      st.trap('QUIT') do
-        if n < 3
-          Process.kill('QUIT', Process.pid)
-          n += 1
+    it 'SIG_IGN' do
+      # IGNORE signal handler has possible race condition in Ruby 2.1
+      # https://bugs.ruby-lang.org/issues/9835
+      # That's why ignore this test in Ruby2.1
+      if RUBY_VERSION >= '2.2'
+        t = SignalThread.new do |st|
+          st.trap('QUIT', 'SIG_IGN')
         end
+
+        Process.kill('QUIT', Process.pid)
+
+        t.stop.join
       end
     end
 
-    Process.kill('QUIT', Process.pid)
-    sleep 0.5
+    it 'signal in handler' do
+      n = 0
 
-    n.should == 3
-  end
+      SignalThread.new do |st|
+        st.trap('QUIT') do
+          if n < 3
+            Process.kill('QUIT', Process.pid)
+            n += 1
+          end
+        end
+      end
 
-  it 'stop in handler' do
-    t = SignalThread.new do |st|
-      st.trap('QUIT') { st.stop }
-    end
+      Process.kill('QUIT', Process.pid)
+      sleep 0.5
 
-    Process.kill('QUIT', Process.pid)
-    sleep 0.5
+      n.should == 3
+    end
 
-    t.join
-  end
+    it 'stop in handler' do
+      t = SignalThread.new do |st|
+        st.trap('QUIT') { st.stop }
+      end
 
-  it 'should not deadlock' do
-    n = 0
+      Process.kill('QUIT', Process.pid)
+      sleep 0.5
 
-    SignalThread.new do |st|
-      st.trap('CONT') { n += 1 }
+      t.join
     end
 
-    (1..10).map {
-      Thread.new do
-        10.times {
-          Process.kill('CONT', Process.pid)
-        }
+    it 'should not deadlock' do
+      n = 0
+
+      SignalThread.new do |st|
+        st.trap('CONT') { n += 1 }
       end
-    }.each { |t|
-      t.join
-    }
 
-    # result won't be 100 because of kernel limitation
-    n.should > 0
+      (1..10).map {
+        Thread.new do
+          10.times {
+            Process.kill('CONT', Process.pid)
+          }
+        end
+      }.each { |t|
+        t.join
+      }
+
+      # give chance to run the signal thread
+      sleep 0.1
+
+      # result won't be 100 because of kernel limitation
+      n.should > 0
+    end
   end
 end
 

data/spec/supervisor_spec.rb

@@ -2,14 +2,20 @@
 describe ServerEngine::Supervisor do
   include_context 'test server and worker'
 
-  def start_supervisor(config={})
-    sv = Supervisor.new(TestServer, TestWorker, config)
+  def start_supervisor(worker = nil, **config)
+    if ServerEngine.windows?
+      config[:windows_daemon_cmdline] = windows_supervisor_cmdline(nil, worker, config)
+    end
+    sv = Supervisor.new(TestServer, worker || TestWorker, config)
     t = Thread.new { sv.main }
 
     return sv, t
   end
 
-  def start_daemon(config={})
+  def start_daemon(**config)
+    if ServerEngine.windows?
+      config[:windows_daemon_cmdline] = windows_daemon_cmdline
+    end
     daemon = Daemon.new(nil, TestWorker, config)
     t = Thread.new { daemon.main }
 
@@ -66,105 +72,135 @@ describe ServerEngine::Supervisor do
     end
   end
 
-  it 'start and graceful stop' do
-    sv, t = start_supervisor
+  ['signal', 'pipe'].each do |sender|
+    context "when using #{sender} as command_sender" do
 
-    begin
-      wait_for_fork
+      it 'start and graceful stop' do
+        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
 
-      test_state(:server_before_run).should == 1
-      test_state(:server_after_start).should == 1  # parent
-    ensure
-      sv.stop(true)
-      t.join
-    end
+        sv, t = start_supervisor(command_sender: sender)
 
-    test_state(:server_stop).should == 1
-    test_state(:server_stop_graceful).should == 1
-    test_state(:server_restart).should == 0
+        begin
+          wait_for_fork
 
-    test_state(:server_after_run).should == 1
-    test_state(:server_after_start).should == 1
-  end
+          test_state(:server_before_run).should == 1
+          test_state(:server_after_start).should == 1  # parent
+        ensure
+          sv.stop(true)
+          t.join
+        end
 
-  it 'immediate stop' do
-    sv, t = start_supervisor
+        test_state(:server_stop).should == 1
+        test_state(:server_stop_graceful).should == 1
+        test_state(:server_restart).should == 0
 
-    begin
-      wait_for_fork
-    ensure
-      sv.stop(false)
-      t.join
-    end
+        test_state(:server_after_run).should == 1
+        test_state(:server_after_start).should == 1
+      end
 
-    test_state(:server_stop).should == 1
-    test_state(:server_stop_immediate).should == 1
-    test_state(:server_after_run).should == 1
-    test_state(:server_after_start).should == 1
-  end
+      it 'immediate stop' do
+        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
 
-  it 'graceful restart' do
-    sv, t = start_supervisor
+        sv, t = start_supervisor(command_sender: sender)
 
-    begin
-      wait_for_fork
+        begin
+          wait_for_fork
+        ensure
+          sv.stop(false)
+          t.join
+        end
 
-      sv.restart(true)
-      wait_for_stop
+        test_state(:server_stop).should == 1
+        test_state(:server_stop_immediate).should == 1
+        test_state(:server_after_run).should == 1
+        test_state(:server_after_start).should == 1
+      end
 
-    ensure
-      sv.stop(true)
-      t.join
-    end
+      it 'graceful restart' do
+        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
 
-    test_state(:server_stop).should == 1
-    test_state(:server_restart_graceful).should == 1
+        sv, t = start_supervisor(command_sender: sender)
 
-    test_state(:server_before_run).should == 1
-    test_state(:server_after_run).should == 1
-    test_state(:server_after_start).should == 1
-  end
+        begin
+          wait_for_fork
 
-  it 'immediate restart' do
-    sv, t = start_supervisor
+          sv.restart(true)
+          wait_for_stop
 
-    begin
-      wait_for_fork
+        ensure
+          sv.stop(true)
+          t.join
+        end
 
-      sv.restart(false)
-      wait_for_stop
+        test_state(:server_stop).should == 1
+        test_state(:server_restart_graceful).should == 1
 
-    ensure
-      sv.stop(true)
-      t.join
-    end
+        test_state(:server_before_run).should == 1
+        test_state(:server_after_run).should == 1
+        test_state(:server_after_start).should == 1
+      end
 
-    test_state(:server_stop).should == 1
-    test_state(:server_restart_immediate).should == 1
+      it 'immediate restart' do
+        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
 
-    test_state(:server_before_run).should == 1
-    test_state(:server_after_run).should == 1
-    test_state(:server_after_start).should == 1
-  end
+        sv, t = start_supervisor(command_sender: sender)
 
-  it 'reload' do
-    sv, t = start_supervisor
+        begin
+          wait_for_fork
 
-    begin
-      wait_for_fork
+          sv.restart(false)
+          wait_for_stop
 
-      sv.reload
+        ensure
+          sv.stop(true)
+          t.join
+        end
 
-    ensure
-      sv.stop(true)
-      t.join
-    end
+        test_state(:server_stop).should == 1
+        test_state(:server_restart_immediate).should == 1
 
-    test_state(:server_stop).should == 1
-    test_state(:server_reload).should == 1
-  end
+        test_state(:server_before_run).should == 1
+        test_state(:server_after_run).should == 1
+        test_state(:server_after_start).should == 1
+      end
 
-  # TODO detach
+      it 'reload' do
+        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
+
+        sv, t = start_supervisor(command_sender: sender)
+
+        begin
+          wait_for_fork
+
+          sv.reload
+
+        ensure
+          sv.stop(true)
+          t.join
+        end
+
+        test_state(:server_stop).should == 1
+        test_state(:server_reload).should == 1
+      end
+
+      # TODO detach
+
+      it 'auto restart in limited ratio' do
+        pending 'not supported on Windows' if ServerEngine.windows? && sender == 'signal'
+
+        sv, t = start_supervisor(RunErrorWorker, server_restart_wait: 1, command_sender: sender)
+
+        begin
+          sleep 2.2
+        ensure
+          sv.stop(true)
+          t.join
+        end
+
+        test_state(:worker_run).should == 3
+      end
+    end
+  end
 
   module InitializeErrorServer
     def initialize
@@ -176,26 +212,4 @@ describe ServerEngine::Supervisor do
     sv = Supervisor.new(InitializeErrorServer, TestWorker)
     lambda { sv.main }.should raise_error(StandardError)
   end
-
-  module RunErrorWorker
-    def run
-      incr_test_state :worker_run
-      raise StandardError, "error test"
-    end
-  end
-
-  it 'auto restart in limited ratio' do
-    sv = Supervisor.new(TestServer, RunErrorWorker, server_restart_wait: 1)
-    t = Thread.new { sv.main }
-
-    begin
-      sleep 2.2
-    ensure
-      sv.stop(true)
-      t.join
-    end
-
-    test_state(:worker_run).should == 3
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 2.0.0pre1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.4
 description: A framework to implement robust multiprocess servers like Unicorn
 email:
 - frsyuki@gmail.com
@@ -69,8 +97,11 @@ files:
 - README.md
 - Rakefile
 - appveyor.yml
+- examples/server.rb
+- examples/spawn_worker_script.rb
 - lib/serverengine.rb
 - lib/serverengine/blocking_flag.rb
+- lib/serverengine/command_sender.rb
 - lib/serverengine/config_loader.rb
 - lib/serverengine/daemon.rb
 - lib/serverengine/daemon_logger.rb
@@ -79,9 +110,11 @@ files:
 - lib/serverengine/multi_spawn_server.rb
 - lib/serverengine/multi_thread_server.rb
 - lib/serverengine/multi_worker_server.rb
+- lib/serverengine/privilege.rb
 - lib/serverengine/process_manager.rb
 - lib/serverengine/server.rb
 - lib/serverengine/signal_thread.rb
+- lib/serverengine/signals.rb
 - lib/serverengine/socket_manager.rb
 - lib/serverengine/socket_manager_unix.rb
 - lib/serverengine/socket_manager_win.rb
@@ -112,15 +145,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ServerEngine - multiprocess server framework
@@ -134,3 +167,4 @@ test_files:
 - spec/socket_manager_spec.rb
 - spec/spec_helper.rb
 - spec/supervisor_spec.rb
+has_rdoc: false