serverengine 1.5.4 → 1.5.5

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - rbx-19mode
+
+branches:
+  only:
+    - master
+
+script: bundle exec rake

data/Changelog

@@ -1,4 +1,15 @@
 
+2013-09-17 version 1.5.5:
+
+* worker_type=thread and embedded show uncaught errors caused in Worker#stop
+  and Worker#reload interface
+* ProcessManager: enables child process heartbeat only if enable_heartbeat
+  option is true
+* ProcessManager: doesn't call fcntl on pipe pairs if F_SETFD or FD_CLOEXEC
+  is not defined
+* ProcessManager: added #spawn(*args) method
+
+
 2013-09-10 version 1.5.4:
 
 * SignalThread: fixed "Unexpected error can't be called from trap context"

data/lib/serverengine/embedded_server.rb

@@ -27,19 +27,37 @@ module ServerEngine
 
     def stop(stop_graceful)
       super
-      Thread.new { @worker.stop }
+      Thread.new do
+        begin
+          @worker.stop
+        rescue => e
+          ServerEngine.dump_uncaught_error(e)
+        end
+      end
       nil
     end
 
     def restart(stop_graceful)
       super
-      Thread.new { @worker.stop }
+      Thread.new do
+        begin
+          @worker.stop
+        rescue => e
+          ServerEngine.dump_uncaught_error(e)
+        end
+      end
       nil
     end
 
     def reload
       super
-      Thread.new { @worker.reload }
+      Thread.new do
+        begin
+          @worker.reload
+        rescue => e
+          ServerEngine.dump_uncaught_error(e)
+        end
+      end
       nil
     end
   end

data/lib/serverengine/multi_process_server.rb

@@ -23,6 +23,7 @@ module ServerEngine
         auto_tick: false,
         graceful_kill_signal: Daemon::Signals::GRACEFUL_STOP,
         immediate_kill_signal: Daemon::Signals::IMMEDIATE_STOP,
+        enable_heartbeat: true,
         auto_heartbeat: true,
         on_heartbeat_error: Proc.new do
           @logger.fatal "parent process unexpectedly terminated"
@@ -69,7 +70,7 @@ module ServerEngine
           $0 = @worker_process_name % [wid] if @worker_process_name
           w.install_signal_handlers
 
-          Daemon.change_privilege(@chumask, @chgroup)
+          Daemon.change_privilege(@chuser, @chgroup)
           File.umask(@chumask) if @chumask
 
           ## recreate the logger created at Server#main

data/lib/serverengine/multi_thread_server.rb

@@ -40,12 +40,24 @@ module ServerEngine
       end
 
       def send_stop(stop_graceful)
-        Thread.new { @worker.stop }
+        Thread.new do
+          begin
+            @worker.stop
+          rescue => e
+            ServerEngine.dump_uncaught_error(e)
+          end
+        end
         nil
       end
 
       def send_reload
-        Thread.new { @worker.reload }
+        Thread.new do
+          begin
+            @worker.reload
+          rescue => e
+            ServerEngine.dump_uncaught_error(e)
+          end
+        end
       end
 
       def join

data/lib/serverengine/process_manager.rb

@@ -31,9 +31,10 @@ module ServerEngine
       @immediate_kill_signal = config[:immediate_kill_signal] || :QUIT
 
       @auto_tick = config.fetch(:auto_tick, true)
-      @tick_interval = config[:tick_interval] || 1
+      @auto_tick_interval = config[:auto_tick_interval] || 1
 
-      @auto_heartbeat = config.fetch(:auto_heartbeat, true)
+      @enable_heartbeat = !!config[:enable_heartbeat]
+      @auto_heartbeat = !!config.fetch(:auto_heartbeat, true)
 
       case op = config[:on_heartbeat_error]
       when nil
@@ -60,6 +61,10 @@ module ServerEngine
 
     attr_accessor :cloexec_mode
 
+    attr_reader :graceful_kill_signal, :immediate_kill_signal
+    attr_reader :auto_tick, :auto_tick_interval
+    attr_reader :enable_heartbeat, :auto_heartbeat
+
     CONFIG_PARAMS = {
       heartbeat_interval: 1,
       heartbeat_timeout: 180,
@@ -71,8 +76,6 @@ module ServerEngine
       immediate_kill_timeout: 600,
     }
 
-    attr_reader :graceful_kill_signal, :immediate_kill_signal
-
     CONFIG_PARAMS.each_pair do |key,default_value|
       attr_reader key
 
@@ -90,14 +93,14 @@ module ServerEngine
     end
 
     def fork(&block)
-      rpipe, wpipe = new_pair
+      rpipe, wpipe = new_pipe_pair
 
       begin
         pid = Process.fork do
           self.close
           begin
             t = Target.new(wpipe)
-            if @auto_heartbeat
+            if @enable_heartbeat && @auto_heartbeat
               HeartbeatThread.new(self, t, @heartbeat_error_proc)
             end
 
@@ -115,25 +118,68 @@ module ServerEngine
 
         @monitors << m
         @rpipes[rpipe] = m
+        rpipe = nil
 
         return m
 
       ensure
         wpipe.close
+        rpipe.close if rpipe
       end
     end
 
-    def new_pair
-      rpipe, wpipe = IO.pipe
+    def spawn(*args)
+      if args.first.is_a?(Hash)
+        env = args.shift.dup
+      else
+        env = {}
+      end
 
-      case @cloexec_mode
-      when :target_only
-        wpipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-      when :monitor_only
-        rpipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      if args.last.is_a?(Hash)
+        options = args.pop.dup
       else
-        rpipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-        wpipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        options = {}
+      end
+
+      # pipe is necessary even if @enable_heartbeat == false because
+      # parent process detects shutdown of a child process using it
+      rpipe, wpipe = new_pipe_pair
+
+      begin
+        options[wpipe.fileno] = wpipe
+        if @enable_heartbeat
+          env['SERVERENGINE_HEARTBEAT_PIPE'] = wpipe.fileno.to_s
+        end
+
+        pid = Process.spawn(env, *args, options)
+
+        m = Monitor.new(self, pid)
+
+        @monitors << m
+        @rpipes[rpipe] = m
+        rpipe = nil
+
+        return m
+
+      ensure
+        wpipe.close
+        rpipe.close if rpipe
+      end
+    end
+
+    def new_pipe_pair
+      rpipe, wpipe = IO.pipe
+
+      if Fcntl.const_defined?(:F_SETFD) && Fcntl.const_defined?(:FD_CLOEXEC)
+        case @cloexec_mode
+        when :target_only
+          wpipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        when :monitor_only
+          rpipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        else
+          rpipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+          wpipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        end
       end
 
       rpipe.sync = true
@@ -159,26 +205,25 @@ module ServerEngine
       end
 
       ready_pipes, _, _ = IO.select(@rpipes.keys, nil, nil, blocking_timeout)
-      unless ready_pipes
-        return nil
-      end
 
       time ||= Time.now
 
-      ready_pipes.each do |r|
-        begin
-          r.read_nonblock(1024, @read_buffer)
-        rescue Errno::EAGAIN, Errno::EINTR
-          next
-        rescue #EOFError
-          m = @rpipes.delete(r)
-          m.start_immediate_stop!
-          r.close rescue nil
-          next
-        end
+      if ready_pipes
+        ready_pipes.each do |r|
+          begin
+            r.read_nonblock(1024, @read_buffer)
+          rescue Errno::EAGAIN, Errno::EINTR
+            next
+          rescue #EOFError
+            m = @rpipes.delete(r)
+            m.start_immediate_stop!
+            r.close rescue nil
+            next
+          end
 
-        if m = @rpipes[r]
-          m.last_heartbeat_time = time
+          if m = @rpipes[r]
+            m.last_heartbeat_time = time
+          end
         end
       end
 
@@ -189,7 +234,7 @@ module ServerEngine
       nil
     end
 
-    def self.signal_name(n)
+    def self.format_signal_name(n)
       Signal.list.each_pair {|k,v|
         return "SIG#{k}" if n == v
       }
@@ -200,7 +245,7 @@ module ServerEngine
       case code
       when Process::Status
         if code.signaled?
-          "signal #{signal_name(code.termsig)}"
+          "signal #{format_signal_name(code.termsig)}"
         else
           "status #{code.exitstatus}"
         end
@@ -301,10 +346,17 @@ module ServerEngine
         return false unless pid
 
         if !@immediate_kill_start_time
-          # check escalation
-          if heartbeat_delay >= @pm.heartbeat_timeout ||
-              (@graceful_kill_start_time && @pm.graceful_kill_timeout >= 0 &&
-               @graceful_kill_start_time < now - @pm.graceful_kill_timeout)
+          # check heartbeat timeout or escalation
+          if (
+              # heartbeat timeout
+              @pm.enable_heartbeat &&
+              heartbeat_delay >= @pm.heartbeat_timeout
+             ) || (
+               # escalation
+               @graceful_kill_start_time &&
+               @pm.graceful_kill_timeout >= 0 &&
+               @graceful_kill_start_time < now - @pm.graceful_kill_timeout
+             )
             # escalate to immediate kill
             @kill_count = 0
             @immediate_kill_start_time = now
@@ -362,7 +414,7 @@ module ServerEngine
 
       def main
         while true
-          @pm.tick(@pm.tick_interval)
+          @pm.tick(@pm.auto_tick_interval)
         end
         nil
       rescue AlreadyClosedError

data/lib/serverengine/supervisor.rb

@@ -31,6 +31,7 @@ module ServerEngine
         auto_tick: false,
         graceful_kill_signal: Daemon::Signals::GRACEFUL_STOP,
         immediate_kill_signal: Daemon::Signals::IMMEDIATE_STOP,
+        enable_heartbeat: true,
         auto_heartbeat: true,
       )
 

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
@@ -67,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Changelog
 - Gemfile
 - LICENSE