[incubator-apisix] branch master updated: feature: allow to congfiure the worker_shutdown_timeout (#1828)

[me...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new bfa24d4  feature: allow to congfiure the worker_shutdown_timeout (#1828)
bfa24d4 is described below

commit bfa24d41bafd28ec6ea5e51c19ed500ae0d30ad9
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Fri Jul 10 21:59:44 2020 +0800

    feature: allow to congfiure the worker_shutdown_timeout (#1828)
    
    The default 3s may be too low.
---
 bin/apisix       | 2 +-
 conf/config.yaml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/apisix b/bin/apisix
index ab80ea1..6f3e393 100755
--- a/bin/apisix
+++ b/bin/apisix
@@ -106,7 +106,7 @@ events {
 
 worker_rlimit_core  {* worker_rlimit_core *};
 
-worker_shutdown_timeout 3;
+worker_shutdown_timeout {* worker_shutdown_timeout *};
 
 env APISIX_PROFILE;
 
diff --git a/conf/config.yaml b/conf/config.yaml
index 53787a6..4770622 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -101,6 +101,7 @@ nginx_config:                     # config for render the template to genarate n
   error_log: "logs/error.log"
   error_log_level: "warn"         # warn,error
   worker_rlimit_nofile: 20480     # the number of files a worker process can open, should be larger than worker_connections
+  worker_shutdown_timeout: 3s     # timeout for a graceful shutdown of worker processes
   event:
     worker_connections: 10620
   http: