Commit 28a16bba authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Merge from trunk: 

Downgrade the log level of a worker MPM apr_proc_mutex_foo error
message when it occurs during restart (as we already do for a couple
of other calls).

Reviewed by: jorton, pquerna



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@202152 13f79535-47bb-0310-9956-ffa450edef68
parent b4c9dff6

server/mpm/worker/worker.c

+7 −1
Original line number Diff line number Diff line
@@ -738,7 +738,13 @@ static void *listener_thread(apr_thread_t *thd, void * dummy) 
        else {

            if ((rv = SAFE_ACCEPT(apr_proc_mutex_unlock(accept_mutex)))

                != APR_SUCCESS) {

                ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,

                int level = APLOG_EMERG;



                if (ap_scoreboard_image->parent[process_slot].generation != 

                    ap_scoreboard_image->global->running_generation) {

                    level = APLOG_DEBUG; /* common to get these at restart time */

                }

                ap_log_error(APLOG_MARK, level, rv, ap_server_conf,

                             "apr_proc_mutex_unlock failed. Attempting to "

                             "shutdown process gracefully.");

                signal_threads(ST_GRACEFUL);