bugfix: applied the cache_manager_exit patch to the nginx core to fix an issue when the cache manager process is shutting down.
This commit is contained in:
parent
95d727fd8f
commit
b694456ef3
|
@ -0,0 +1,19 @@
|
|||
# HG changeset patch
|
||||
# User Yichun Zhang <agentzh@gmail.com>
|
||||
# Date 1383598130 28800
|
||||
# Node ID f64218e1ac963337d84092536f588b8e0d99bbaa
|
||||
# Parent dea321e5c0216efccbb23e84bbce7cf3e28f130c
|
||||
Cache: gracefully exit the cache manager process.
|
||||
|
||||
diff -r dea321e5c021 -r f64218e1ac96 src/os/unix/ngx_process_cycle.c
|
||||
--- a/src/os/unix/ngx_process_cycle.c Thu Oct 31 18:23:49 2013 +0400
|
||||
+++ b/src/os/unix/ngx_process_cycle.c Mon Nov 04 12:48:50 2013 -0800
|
||||
@@ -1335,7 +1335,7 @@
|
||||
|
||||
if (ngx_terminate || ngx_quit) {
|
||||
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
|
||||
- exit(0);
|
||||
+ ngx_worker_process_exit(cycle);
|
||||
}
|
||||
|
||||
if (ngx_reopen) {
|
|
@ -199,6 +199,10 @@ echo "$info_txt applying the proxy_host_port_vars patch for nginx $ver"
|
|||
patch -p1 < $root/patches/nginx-$ver-proxy_host_port_vars.patch || exit 1
|
||||
echo
|
||||
|
||||
echo "$info_txt applying the cache_manager_exit patch for nginx $ver"
|
||||
patch -p1 < $root/patches/nginx-$ver-cache_manager_exit.patch || exit 1
|
||||
echo
|
||||
|
||||
rm -f *.patch || exit 1
|
||||
|
||||
cd .. || exit 1
|
||||
|
|
Loading…
Reference in New Issue