serverengine 1.5.1 → 1.5.2

data/Changelog

@@ -1,4 +1,11 @@
 
+2013-06-11 version 1.5.2:
+
+* Updated default parameters of ProcessManager to be more conservative
+* Daemon: added :daemonize_error_exit_code option
+* Fixed ServerEngine.create
+
+
 2013-06-04 version 1.5.1:
 
 * Changed #close callback to #after_start

data/README.md

@@ -326,6 +326,7 @@ Graceful shutdown and restart call `Worker#stop` method and wait for completion
   - **chuser** changes execution user (not dynamic reloadable)
   - **chgroup** changes execution group (not dynamic reloadable)
   - **chumask** changes umask (not dynamic reloadable)
+  - **daemonize_error_exit_code** exit code when daemonize, changing user or changing group fails (default: 1) (not dynamic reloadable)
 - Supervisor: available only when `supervisor` parameters is true
   - **server_process_name** changes process name ($0) of server process (not dynamic reloadable)
   - **restart_server_process** restarts server process when it receives USR1 or HUP signal. (default: false) (not dynamic reloadable)
@@ -340,14 +341,14 @@ Graceful shutdown and restart call `Worker#stop` method and wait for completion
   - **start_worker_delay_rand** randomizes start_worker_delay at this ratio (default: 0.2)
 - Multiprocess server: available only when `worker_type` is "process"
   - **worker_process_name** changes process name ($0) of workers
-  - **worker_heartbeat_interval**
-  - **worker_heartbeat_timeout**
-  - **worker_graceful_kill_interval**
-  - **worker_graceful_kill_interval_increment**
-  - **worker_graceful_kill_timeout**
-  - **worker_immediate_kill_interval**
-  - **worker_immediate_kill_interval_increment**
-  - **worker_immediate_kill_timeout**
+  - **worker_heartbeat_interval** sets interval of heartbeats in seconds (default: 1.0)
+  - **worker_heartbeat_timeout** sets timeout of heartbeat in seconds (default: 180)
+  - **worker_graceful_kill_interval** sets the first interval of TERM signals in seconds (default: 15)
+  - **worker_graceful_kill_interval_increment** sets increment of TERM signal interval in seconds (default: 10)
+  - **worker_graceful_kill_timeout** sets promotion timeout from TERM to QUIT signal in seconds. -1 means no timeout (default: 600)
+  - **worker_immediate_kill_interval** sets the first interval of QUIT signals in seconds (default: 10)
+  - **worker_immediate_kill_interval_increment** sets increment of QUIT signal interval in seconds (default: 10)
+  - **worker_immediate_kill_timeout** sets promotion timeout from QUIT to KILL signal in seconds. -1 means no timeout (default: 600)
 - Logger
   - **log** sets path to log file. Set "-" for STDOUT (default: STDERR)
   - **log_level** log level: debug, info, warn, error or fatal. (default: debug)

data/lib/serverengine.rb

@@ -47,6 +47,6 @@ module ServerEngine
   }
 
   def self.create(server_module, worker_module, load_config_proc={}, &block)
-    Daemon.new(server_module, worker_module, load_config_proc={}, &block)
+    Daemon.new(server_module, worker_module, load_config_proc, &block)
   end
 end

data/lib/serverengine/daemon.rb

@@ -41,6 +41,7 @@ module ServerEngine
       end
 
       @daemon_process_name = @config[:daemon_process_name]
+      @daemonize_error_exit_code = @config[:daemonize_error_exit_code] || 1
 
       @pid_path = @config[:pid_path]
       @chuser = @config[:chuser]
@@ -63,7 +64,7 @@ module ServerEngine
         chgid = group.to_i
         if chgid.to_s != group
           chgid = `id -g #{Shellwords.escape group}`.to_i
-          exit! 1 unless $?.success?
+          exit! @daemonize_error_exit_code unless $?.success?
         end
         Process::GID.change_privilege(chgid)
       end
@@ -72,11 +73,11 @@ module ServerEngine
         chuid = user.to_i
         if chuid.to_s != user
           chuid = `id -u #{Shellwords.escape user}`.to_i
-          exit! 1 unless $?.success?
+          exit! @daemonize_error_exit_code unless $?.success?
         end
 
         user_groups = `id -G #{Shellwords.escape user}`.split.map(&:to_i)
-        exit! 1 unless $?.success?
+        exit! @daemonize_error_exit_code unless $?.success?
 
         Process.groups = Process.groups | user_groups
         Process::UID.change_privilege(chuid)
@@ -90,7 +91,7 @@ module ServerEngine
         exit main
       rescue
         ServerEngine.dump_uncaught_error($!)
-        exit 1  # TODO exit code
+        exit @daemonize_error_exit_code
       end
     end
 
@@ -133,7 +134,7 @@ module ServerEngine
 
           exit 0
         ensure
-          exit! 1  # TODO exit code
+          exit! @daemonize_error_exit_code
         end
       end
 
@@ -148,7 +149,7 @@ module ServerEngine
 
       data = rpipe.read
       if data != "\n"
-        return 1  # TODO exit code
+        return @daemonize_error_exit_code
       end
 
       return 0

data/lib/serverengine/process_manager.rb

@@ -62,13 +62,13 @@ module ServerEngine
 
     CONFIG_PARAMS = {
       heartbeat_interval: 1,
-      heartbeat_timeout: 60,
-      graceful_kill_interval: 2,
-      graceful_kill_interval_increment: 2,
-      graceful_kill_timeout: -1,
-      immediate_kill_interval: 2,
-      immediate_kill_interval_increment: 2,
-      immediate_kill_timeout: 60,
+      heartbeat_timeout: 180,
+      graceful_kill_interval: 15,
+      graceful_kill_interval_increment: 10,
+      graceful_kill_timeout: 600,
+      immediate_kill_interval: 10,
+      immediate_kill_interval_increment: 10,
+      immediate_kill_timeout: 600,
     }
 
     attr_reader :graceful_kill_signal, :immediate_kill_signal
@@ -303,7 +303,7 @@ module ServerEngine
         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 && @pm.graceful_kill_timeout >= 0 &&
                @graceful_kill_start_time < now - @pm.graceful_kill_timeout)
             # escalate to immediate kill
             @kill_count = 0
@@ -322,7 +322,8 @@ module ServerEngine
         if @immediate_kill_start_time
           interval = @pm.immediate_kill_interval
           interval_incr = @pm.immediate_kill_interval_increment
-          if @immediate_kill_start_time <= now - @pm.immediate_kill_timeout
+          if @pm.immediate_kill_timeout >= 0 &&
+              @immediate_kill_start_time <= now - @pm.immediate_kill_timeout
             # escalate to SIGKILL
             signal = :KILL
           else

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2571011204453974309
+      hash: 3345901740562467160
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23