httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r813532 - in /httpd/mod_fcgid/trunk/modules/fcgid: fcgid_bridge.c fcgid_conf.c fcgid_pm_unix.c fcgid_pm_win.c fcgid_proc_unix.c fcgid_proc_win.c fcgid_proctbl_unix.c fcgid_spawn_ctl.c mod_fcgid.c
Date Thu, 10 Sep 2009 18:10:16 GMT
Author: trawick
Date: Thu Sep 10 18:10:15 2009
New Revision: 813532

URL: http://svn.apache.org/viewvc?rev=813532&view=rev
Log:
improve text of error messages
fix a few pid_t format strings

Modified:
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c
    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_proctbl_unix.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c
    httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c?rev=813532&r1=813531&r2=813532&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c Thu Sep 10 18:10:15 2009
@@ -190,7 +190,7 @@
             /* Do nothing but print log */
             ap_log_error(APLOG_MARK, APLOG_INFO, 0,
                          main_server,
-                         "mod_fcgid: process busy timeout, take %d seconds for this request",
+                         "mod_fcgid: process busy timeout, took %d seconds for this request",
                          dt);
         } else if (ctx->has_error) {
             ctx->procnode->diewhy = FCGID_DIE_COMM_ERROR;
@@ -393,7 +393,7 @@
          proc_write_ipc(main_server, &bucket_ctx->ipc,
                         output_brigade)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, r->server,
-                     "mod_fcgid: write data to fastcgi server error");
+                     "mod_fcgid: error writing data to FastCGI server");
         bucket_ctx->has_error = 1;
         return HTTP_INTERNAL_SERVER_ERROR;
     }

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c?rev=813532&r1=813531&r2=813532&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c Thu Sep 10 18:10:15 2009
@@ -819,7 +819,7 @@
     if ((rv = apr_stat(&finfo, path, APR_FINFO_NORM,
                        cmd->temp_pool)) != APR_SUCCESS) {
         return apr_psprintf(cmd->pool,
-                            "can't get fastcgi file info: %s(%s), errno: %d",
+                            "can't get FastCGI file info: %s(%s), errno: %d",
                             wrapperpath, path, apr_get_os_error());
     }
 

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c?rev=813532&r1=813531&r2=813532&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c Thu Sep 10 18:10:15 2009
@@ -129,7 +129,7 @@
             if (kill(getpid(), SIGHUP) < 0) {
                 ap_log_error(APLOG_MARK, APLOG_EMERG,
                              apr_get_os_error(), NULL,
-                             "mod_fcgid: can' kill myself a signal SIGHUP");
+                             "mod_fcgid: can't send SIGHUP to self");
                 exit(0);
             }
         }
@@ -143,7 +143,7 @@
         if (kill(getpid(), SIGHUP) < 0) {
             ap_log_error(APLOG_MARK, APLOG_EMERG,
                          apr_get_os_error(), NULL,
-                         "mod_fcgid: can' kill myself a signal SIGHUP");
+                         "mod_fcgid: can't send SIGHUP to self");
             exit(0);
         }
         break;
@@ -240,7 +240,7 @@
 
         if ((rv = init_signal(main_server)) != APR_SUCCESS) {
             ap_log_error(APLOG_MARK, LOG_EMERG, 0, main_server,
-                         "mod_fcgid: can't intall signal handler, exit now");
+                         "mod_fcgid: can't install signal handler, exiting now");
             exit(1);
         }
 
@@ -248,7 +248,7 @@
         if (ap_unixd_config.suexec_enabled) {
             if (getuid() != 0) {
                 ap_log_error(APLOG_MARK, LOG_EMERG, 0, main_server,
-                             "mod_fcgid: current user is not root while suexec is enabled,
exit now");
+                             "mod_fcgid: current user is not root while suexec is enabled,
exiting now");
                 exit(1);
             }
             suexec_setup_child();
@@ -414,7 +414,11 @@
         initenv_entry = (apr_table_entry_t *) initenv_arr->elts;
         if (initenv_arr->nelts > INITENV_CNT)
             ap_log_error(APLOG_MARK, LOG_WARNING, 0, main_server,
-                         "mod_fcgid: too much environment variables, Please increase INITENV_CNT
in fcgid_pm.h and recompile module mod_fcgid");
+                         "mod_fcgid: %d environment variables dropped; increase "
+                         "INITENV_CNT in fcgid_pm.h from %d to at least %d",
+                         initenv_arr->nelts - INITENV_CNT,
+                         INITENV_CNT,
+                         initenv_arr->nelts);
 
         for (i = 0; i < initenv_arr->nelts && i < INITENV_CNT; ++i) {
             if (initenv_entry[i].key == NULL
@@ -521,7 +525,7 @@
     /* Log any unexpect result */
     if (rv != APR_SUCCESS && !APR_STATUS_IS_TIMEUP(rv)) {
         ap_log_error(APLOG_MARK, LOG_WARNING, rv, main_server,
-                     "mod_fcgid: wait io error while getting message from pipe");
+                     "mod_fcgid: error while waiting for message from pipe");
         return rv;
     }
 

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c?rev=813532&r1=813531&r2=813532&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c Thu Sep 10 18:10:15 2009
@@ -140,8 +140,12 @@
         initenv_arr = apr_table_elts(initenv);
         initenv_entry = (apr_table_entry_t *) initenv_arr->elts;
         if (initenv_arr->nelts > INITENV_CNT)
-            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, main_server,
-                         "mod_fcgid: too much environment variables, Please increase INITENV_CNT
in fcgid_pm.h and recompile module mod_fcgid");
+            ap_log_error(APLOG_MARK, LOG_WARNING, 0, main_server,
+                         "mod_fcgid: %d environment variables dropped; increase "
+                         "INITENV_CNT in fcgid_pm.h from %d to at least %d",
+                         initenv_arr->nelts - INITENV_CNT,
+                         INITENV_CNT,
+                         initenv_arr->nelts);
         for (i = 0; i < initenv_arr->nelts && i < INITENV_CNT; ++i) {
             if (initenv_entry[i].key == NULL
                 || initenv_entry[i].key[0] == '\0')

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=813532&r1=813531&r2=813532&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c Thu Sep 10 18:10:15 2009
@@ -209,7 +209,7 @@
         if (rv != APR_SUCCESS) {
             ap_log_error(APLOG_MARK, APLOG_WARNING, rv,
                          procinfo->main_server,
-                         "mod_fcgid: can't cgi name map table");
+                         "mod_fcgid: can't create CGI name map table");
             return APR_ENOMEM;
         }
     }
@@ -574,7 +574,7 @@
     if ((rv =
          set_socket_nonblock(handle_info->handle_socket)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, main_server,
-                     "mod_fcgid: can't set nonblock unix domain socket");
+                     "mod_fcgid: can't make unix domain socket nonblocking");
         return rv;
     }
 
@@ -613,7 +613,7 @@
     if (retcode == -1 && !APR_STATUS_IS_EAGAIN(errno)) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, errno,
                      main_server,
-                     "mod_fcgid: read data from fastcgi server error");
+                     "mod_fcgid: error reading data from FastCGI server");
         return errno;
     }
 
@@ -627,7 +627,7 @@
     if (retcode == -1) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, errno,
                      main_server,
-                     "mod_fcgid: poll unix domain socket error");
+                     "mod_fcgid: error polling unix domain socket");
         return errno;
     } else if (retcode == 0) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
@@ -647,13 +647,13 @@
     if (retcode == 0) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
                      main_server,
-                     "mod_fcgid: Read data error, fastcgi server has close connection");
+                     "mod_fcgid: error reading data, FastCGI server closed connection");
         return APR_EPIPE;
     }
 
     ap_log_error(APLOG_MARK, APLOG_WARNING, errno,
                  main_server,
-                 "mod_fcgid: read data from fastcgi server error.");
+                 "mod_fcgid: error reading data from FastCGI server");
     return errno;
 }
 
@@ -698,7 +698,7 @@
     if (retcode == -1) {
         ap_log_error(APLOG_MARK, APLOG_INFO, apr_get_os_error(),
                      ipc_handle->request->server,
-                     "mod_fcgid: Write data error, fastcgi server has close connection");
+                     "mod_fcgid: error writing data, FastCGI server closed connection");
         return APR_EPIPE;
     }
 
@@ -872,6 +872,6 @@
                      cgipath, procnode->proc_id->pid, diewhy, signal_info);
     else
         ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, main_server,
-                     "mod_fcgid: can't get cgi name while exiting, exitcode: %d",
+                     "mod_fcgid: can't get CGI name while exiting, exitcode: %d",
                      exitcode);
 }

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=813532&r1=813531&r2=813532&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c Thu Sep 10 18:10:15 2009
@@ -99,7 +99,7 @@
         if (rv != APR_SUCCESS) {
             ap_log_error(APLOG_MARK, APLOG_WARNING, rv,
                          procinfo->main_server,
-                         "mod_fcgid: can't cgi name map table");
+                         "mod_fcgid: can't create CGI name map table");
             return APR_ENOMEM;
         }
     }
@@ -184,7 +184,7 @@
                != APR_SUCCESS)
     {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, procinfo->main_server,
-                     "mod_fcgid: can't create fastcgi process attribute");
+                     "mod_fcgid: can't create FastCGI process attribute");
         CloseHandle(listen_handle);
         return APR_ENOPROC;
     }
@@ -358,14 +358,14 @@
     {
         if (GetLastError() == ERROR_FILE_NOT_FOUND) /* The process has exited */
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, main_server,
-                         "mod_fcgid: can't connect to named pipe, fastcgi"
-                         " server %d has been terminated",
+                         "mod_fcgid: can't connect to named pipe, FastCGI"
+                         " server %" APR_PID_T_FMT " has been terminated",
                          procnode->proc_id->pid);
         else
             ap_log_error(APLOG_MARK, APLOG_DEBUG, apr_get_os_error(),
                          main_server,
-                         "mod_fcgid: can't connect to named pipe, fastcgi"
-                         " server pid: %d",
+                         "mod_fcgid: can't connect to named pipe, FastCGI"
+                         " server pid %" APR_PID_T_FMT,
                          procnode->proc_id->pid);
         return APR_ESPIPE;
     }
@@ -560,10 +560,10 @@
     /* Print log now */
     if (cgipath)
         ap_log_error(APLOG_MARK, APLOG_INFO, 0, main_server,
-                     "mod_fcgid: process %s(%d) exit(%s), return code %d",
+                     "mod_fcgid: process %s(%" APR_PID_T_FMT ") exit(%s), return code %d",
                      cgipath, procnode->proc_id->pid, diewhy, exitcode);
     else
         ap_log_error(APLOG_MARK, APLOG_WARNING, 0, main_server,
-                     "mod_fcgid: can't get cgi name while exiting, exitcode: %d",
+                     "mod_fcgid: can't get CGI name while exiting, exitcode: %d",
                      exitcode);
 }

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_unix.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_unix.c?rev=813532&r1=813531&r2=813532&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_unix.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_unix.c Thu Sep 10 18:10:15 2009
@@ -149,7 +149,7 @@
     if ((_global_memory = apr_shm_baseaddr_get(g_sharemem)) == NULL) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, apr_get_os_error(),
                      main_server,
-                     "mod_fcgid: Can't get base address of share memory");
+                     "mod_fcgid: Can't get base address of shared memory");
         exit(1);
     }
 
@@ -257,7 +257,8 @@
 
     if (g_global_share->must_exit) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, 0, main_server,
-                     "mod_fcgid: server is restarted, %d must exit",
+                     "mod_fcgid: server is restarted, pid %" APR_PID_T_FMT
+                     " must exit",
                      getpid());
         kill(getpid(), SIGTERM);
     }
@@ -265,7 +266,8 @@
     /* Lock error is a fatal error */
     if ((rv = proctable_lock_table()) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, rv, main_server,
-                     "mod_fcgid: can't get lock, pid: %d", getpid());
+                     "mod_fcgid: can't get lock in pid %" APR_PID_T_FMT,
+                     getpid());
         exit(1);
     }
 }
@@ -277,7 +279,8 @@
 
     if ((rv = proctable_unlock_table()) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, rv, main_server,
-                     "mod_fcgid: can't unlock, pid: %d", getpid());
+                     "mod_fcgid: can't unlock in pid %" APR_PID_T_FMT, 
+                     getpid());
         exit(1);
     }
 }

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=813532&r1=813531&r2=813532&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_spawn_ctl.c Thu Sep 10 18:10:15 2009
@@ -215,7 +215,7 @@
         /* I need max class proccess count */
         if (current_node->process_counter >= g_max_class_process) {
             ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, main_server,
-                         "mod_fcgid: too much %s process(current:%d, max:%d), skip the spawn
request",
+                         "mod_fcgid: too many %s processes (current:%d, max:%d), skip the
spawn request",
                          command->cgipath, current_node->process_counter,
                          g_max_class_process);
             return 0;

Modified: httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c?rev=813532&r1=813531&r2=813532&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.c Thu Sep 10 18:10:15 2009
@@ -516,7 +516,7 @@
 
     if ((rv = proctable_child_init(main_server, pchild)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, rv, main_server,
-                     "mod_fcgid: Can't initialize share memory or mutex in child");
+                     "mod_fcgid: Can't initialize shared memory or mutex in child");
         return;
     }
 
@@ -562,7 +562,7 @@
     if ((rv =
          proctable_post_config(main_server, config_pool)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, rv, main_server,
-                     "mod_fcgid: Can't initialize share memory or mutex");
+                     "mod_fcgid: Can't initialize shared memory or mutex");
         return rv;
     }
 



Mime
View raw message