Attachment 37997 Details for Bug 65313 – Enf of reload notice before stopping children

[patch] Enf of reload notice before stopping children

event_restart_notices.diff (text/plain), 2.28 KB, created by Yann Ylavic on 2021-08-28 13:22:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yann Ylavic

Created: 2021-08-28 13:22:05 UTC

Size: 2.28 KB

patch

obsolete

>Index: server/mpm/event/event.c
>===================================================================
>--- server/mpm/event/event.c	(revision 1892671)
>+++ server/mpm/event/event.c	(working copy)
>@@ -2866,6 +2866,10 @@ static void child_main(int child_num_arg, int chil
> 
>     ap_run_child_init(pchild, ap_server_conf);
> 
>+    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00000)
>+                 "Child %i initialization done (generation %i)",
>+                 ap_my_pid, retained->mpm->my_generation);
>+
>     if (ap_max_requests_per_child) {
>         conns_this_child = ap_max_requests_per_child;
>     }
>@@ -3407,6 +3411,9 @@ static int event_run(apr_pool_t * _pconf, apr_pool
>     }
>     else {
>         if (retained->mpm->was_graceful) {
>+            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(99999)
>+                         "Gracefully stopping old generation %i",
>+                         retained->mpm->my_generation);
>             /* wake up the children...time to die.  But we'll have more soon */
>             for (i = 0; i < num_buckets; i++) {
>                 ap_mpm_podx_killpg(retained->buckets[i].pod,
>@@ -3414,6 +3421,9 @@ static int event_run(apr_pool_t * _pconf, apr_pool
>             }
>         }
>         else {
>+            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(99999)
>+                         "Ungracefully stopping old generation %i",
>+                         retained->mpm->my_generation);
>             /* Kill 'em all.  Since the child acts the same on the parents SIGTERM
>              * and a SIGHUP, we may as well use the same signal, because some user
>              * pthreads are stealing signals from us left and right.
>@@ -3548,8 +3558,8 @@ static int event_run(apr_pool_t * _pconf, apr_pool
>     }
> 
>     ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00489)
>-                 "%s configured -- resuming normal operations",
>-                 ap_get_server_description());
>+                 "%s configured -- resuming normal operations (generation %i)",
>+                 ap_get_server_description(), retained->mpm->my_generation);
>     ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00490)
>                  "Server built: %s", ap_get_server_built());
>     ap_log_command_line(plog, s);

Actions: View | Diff

Attachments on bug 65313: 37997 | 37998