httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r202152 - /httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c
Date Tue, 28 Jun 2005 10:32:31 GMT
Author: trawick
Date: Tue Jun 28 03:32:25 2005
New Revision: 202152

URL: http://svn.apache.org/viewcvs?rev=202152&view=rev
Log:
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


Modified:
    httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c

Modified: httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c?rev=202152&r1=202151&r2=202152&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c (original)
+++ httpd/httpd/branches/2.0.x/server/mpm/worker/worker.c Tue Jun 28 03:32:25 2005
@@ -738,7 +738,13 @@
         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);



Mime
View raw message