httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r901406 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID modules/fcgid/fcgid_proc_unix.c modules/fcgid/fcgid_proc_win.c modules/fcgid/fcgid_spawn_ctl.c
Date Wed, 20 Jan 2010 22:15:20 GMT
Author: trawick
Date: Wed Jan 20 22:15:20 2010
New Revision: 901406

URL: http://svn.apache.org/viewvc?rev=901406&view=rev
Log:
stop using APLOG_NOTICE for debug or informational messages

PR: 48536

Modified:
    httpd/mod_fcgid/trunk/CHANGES-FCGID
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c

Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=901406&r1=901405&r2=901406&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
+++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Wed Jan 20 22:15:20 2010
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with mod_fcgid 2.3.5
 
+  *) Stop using the unsuppressable "notice" log level for debug and 
+     informational messages.  PR 48536.  [Jeff Trawick]
+
   *) Respect DEFAULT_REL_RUNTIMEDIR for default values of FcgidIPCDir and 
      FcgidProcessTableFile.  [Jeff Trawick]
 

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c?rev=901406&r1=901405&r2=901406&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c Wed Jan 20 22:15:20 2010
@@ -351,7 +351,7 @@
      * procnode->proc_id->pid, so sometimes it's 0 and sometimes it's >0
      */
     if (lpszwapper != NULL && lpszwapper[0] != '\0') {
-        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, procinfo->main_server,
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, procinfo->main_server,
                      "mod_fcgid: call %s with wrapper %s",
                      procinfo->cgipath, lpszwapper);
         if ((rv =
@@ -807,6 +807,7 @@
     const char *diewhy = NULL;
     char signal_info[HUGE_STRING_LEN];
     int signum = exitcode;
+    int loglevel = APLOG_INFO;
 
     memset(signal_info, 0, HUGE_STRING_LEN);
 
@@ -834,7 +835,8 @@
         diewhy = "shutting down";
         break;
     default:
-        diewhy = "unknow";
+        loglevel = APLOG_ERR;
+        diewhy = "unknown";
     }
 
     /* Get signal info */
@@ -849,6 +851,7 @@
             break;
 
         default:
+            loglevel = APLOG_ERR;
             if (APR_PROC_CHECK_CORE_DUMP(exitwhy)) {
                 apr_snprintf(signal_info, HUGE_STRING_LEN - 1,
                              "get signal %d, possible coredump generated",
@@ -867,7 +870,7 @@
     }
 
     /* Print log now */
-    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, main_server,
+    ap_log_error(APLOG_MARK, loglevel, 0, main_server,
                  "mod_fcgid: process %s(%" APR_PID_T_FMT ") exit(%s), %s",
                  procnode->executable_path, procnode->proc_id.pid, diewhy, signal_info);
 }

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c?rev=901406&r1=901405&r2=901406&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c Wed Jan 20 22:15:20 2010
@@ -171,7 +171,7 @@
 
     /* fork and exec now */
     if (wrapper_cmdline != NULL && wrapper_cmdline[0] != '\0') {
-        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, procinfo->main_server,
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, procinfo->main_server,
                      "mod_fcgid: call %s with wrapper %s",
                      procinfo->cgipath, wrapper_cmdline);
         if ((rv = apr_proc_create(&(procnode->proc_id), wargv[0],

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c?rev=901406&r1=901405&r2=901406&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c Wed Jan 20 22:15:20 2010
@@ -191,7 +191,7 @@
 
         /* Total process count higher than up limit? */
         if (g_total_process >= sconf->max_process_count) {
-            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, main_server,
+            ap_log_error(APLOG_MARK, APLOG_INFO, 0, main_server,
                          "mod_fcgid: %s total process count %d >= %d, skip the spawn request",
                          command->cgipath, g_total_process, sconf->max_process_count);
             return 0;
@@ -202,7 +202,7 @@
          */
         /* I need max class proccess count */
         if (current_node->process_counter >= current_node->max_class_process_count)
{
-            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, main_server,
+            ap_log_error(APLOG_MARK, APLOG_INFO, 0, main_server,
                          "mod_fcgid: too many %s processes (current:%d, max:%d), skip the
spawn request",
                          command->cgipath, current_node->process_counter,
                          current_node->max_class_process_count);



Mime
View raw message