[PATCH] Introduced worker_shutdown_idle_delay

Artem Pogartsev iam at arteomp.com
Wed Nov 8 06:13:58 UTC 2023


On Wed, Nov 08, 2023 at 07:51:39AM +0300, Artem Pogartsev via nginx-devel wrote:
> diff -r 7ec761f0365f -r eb0dd3d90343 src/os/unix/ngx_process_cycle.c
>              if (!ngx_exiting) {
>                  ngx_exiting = 1;
> +                ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
>                  ngx_set_shutdown_timer(cycle);

> diff -r 7ec761f0365f -r eb0dd3d90343 src/os/win32/ngx_process_cycle.c
> --- a/src/os/win32/ngx_process_cycle.c	Thu Oct 26 23:35:09 2023 +0300
> +++ b/src/os/win32/ngx_process_cycle.c	Wed Nov 08 07:08:11 2023 +0300
>              if (!ngx_exiting) {
>                  ngx_exiting = 1;
> +                ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
>                  ngx_set_shutdown_timer(cycle);

Sorry, code style violation was overlooked.
The patch to address this (to be folded to the changeset):

diff -r 8cb2c3d2a1ba -r 07e3b2efb78f src/os/unix/ngx_process_cycle.c
--- a/src/os/unix/ngx_process_cycle.c   Wed Nov 08 07:08:11 2023 +0300
+++ b/src/os/unix/ngx_process_cycle.c   Wed Nov 08 09:08:46 2023 +0300
@@ -735,7 +735,8 @@

             if (!ngx_exiting) {
                 ngx_exiting = 1;
-                ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+                ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx,
+                                                       ngx_core_module);
                 ngx_set_shutdown_timer(cycle);
                 ngx_close_listening_sockets(cycle);
                 ngx_close_idle_connections(cycle, ccf->shutdown_idle_delay);
diff -r 8cb2c3d2a1ba -r 07e3b2efb78f src/os/win32/ngx_process_cycle.c
--- a/src/os/win32/ngx_process_cycle.c  Wed Nov 08 07:08:11 2023 +0300
+++ b/src/os/win32/ngx_process_cycle.c  Wed Nov 08 09:08:46 2023 +0300
@@ -802,7 +802,8 @@

             if (!ngx_exiting) {
                 ngx_exiting = 1;
-                ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+                ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx,
+                                                       ngx_core_module);
                 ngx_set_shutdown_timer(cycle);
                 ngx_close_listening_sockets(cycle);
                 ngx_close_idle_connections(cycle, ccf->shutdown_idle_delay);


More information about the nginx-devel mailing list