httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Greg Ames <grega...@raleigh.ibm.com>
Subject Re: [PATCH] fix error msgs when mpm hard limits are exceeded
Date Mon, 19 Jun 2000 20:28:31 GMT
Please ignore the last patch, with lots of wrapped lines.  This should work better:

Index: configure.in
===================================================================
RCS file: /cvs/apache/apache-2.0/src/configure.in,v
retrieving revision 1.59
diff -u -d -b -r1.59 configure.in
--- configure.in	2000/06/12 23:34:23	1.59
+++ configure.in	2000/06/19 19:57:00
@@ -186,6 +186,7 @@
 echo "#define HTTPD_ROOT \"$prefix\"" >> ${path_h}.new
 echo "#define SUEXEC_BIN \"$bindir/suexec\"" >> ${path_h}.new
 echo "#define SERVER_CONFIG_FILE \"conf/$progname.conf\"" >> ${path_h}.new
+echo "#define APACHE_MPM_DIR \"$mpmdir\"" >> ${path_h}.new
 
 cmp ${path_h}.new ${path_h} >/dev/null 2>&1
 if test $? -ne 0 ; then
@@ -201,6 +202,7 @@
 exec_prefix=$exec_prefix
 bindir=$bindir
 progname=$progname
+mpmdir=$MPM_DIR
 ])
 
 AC_TYPE_RLIM_T
Index: include/mpm_common.h
===================================================================
RCS file: /cvs/apache/apache-2.0/src/include/mpm_common.h,v
retrieving revision 1.2
diff -u -d -b -r1.2 mpm_common.h
--- mpm_common.h	2000/05/24 00:41:58	1.2
+++ mpm_common.h	2000/06/19 19:57:00
@@ -77,6 +77,8 @@
 void ap_reclaim_child_processes(int terminate);
 void ap_wait_or_timeout(ap_wait_t *status, ap_proc_t *ret, ap_pool_t *p);
 
+#define AP_MPM_HARD_LIMITS_FILE "src/" APACHE_MPM_DIR "/mpm_default.h"
+
 #ifdef __cplusplus
 }
 #endif
Index: modules/mpm/dexter/dexter.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.95
diff -u -d -b -r1.95 dexter.c
--- dexter.c	2000/06/12 23:02:55	1.95
+++ dexter.c	2000/06/19 19:57:01
@@ -1312,7 +1312,8 @@
                     " lowering NumServers to %d.  To increase, please "
                     "see the", HARD_SERVER_LIMIT);
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                    " HARD_SERVER_LIMIT define in src/include/httpd.h.");
+                    " HARD_SERVER_LIMIT define in %s.",
+                    AP_MPM_HARD_LIMITS_FILE);
        num_daemons = HARD_SERVER_LIMIT;
     } 
     else if (num_daemons < 1) {
@@ -1334,13 +1335,14 @@
     if (threads_to_start > HARD_THREAD_LIMIT) {
         ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
                      "WARNING: StartThreads of %d exceeds compile time"
-                     "limit of %d threads,", threads_to_start,
+                     " limit of %d threads,", threads_to_start,
                      HARD_THREAD_LIMIT);
         ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                     "lowering StartThreads to %d. To increase, please"
-                     "see the", HARD_THREAD_LIMIT);
+                     " lowering StartThreads to %d. To increase, please"
+                     " see the", HARD_THREAD_LIMIT);
         ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                     "HARD_THREAD_LIMIT define in src/include/httpd.h.");
+                     " HARD_THREAD_LIMIT define in %s.",
+                     AP_MPM_HARD_LIMITS_FILE);
     }
     else if (threads_to_start < 1) {
 	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
Index: modules/mpm/mpmt_beos/mpmt_beos.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
retrieving revision 1.33
diff -u -d -b -r1.33 mpmt_beos.c
--- mpmt_beos.c	2000/06/14 00:17:21	1.33
+++ mpmt_beos.c	2000/06/19 19:57:01
@@ -1030,7 +1030,8 @@
                     " lowering MaxClients to %d.  To increase, please "
                     "see the", HARD_SERVER_LIMIT);
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                    " HARD_SERVER_LIMIT define in src/include/httpd.h.");
+                    " HARD_SERVER_LIMIT define in %s.",
+                    AP_MPM_HARD_LIMITS_FILE);
        ap_daemons_limit = HARD_SERVER_LIMIT;
     } 
     else if (ap_daemons_limit < 1) {
@@ -1058,7 +1059,8 @@
                      " lowering ThreadsPerChild to %d. To increase, please"
                      "see the", HARD_THREAD_LIMIT);
         ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                     " HARD_THREAD_LIMIT define in src/include/httpd.h.");
+                     " HARD_THREAD_LIMIT define in %s.",
+                     AP_MPM_HARD_LIMITS_FILE);
     }
     else if (ap_threads_per_child < 1) {
 	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
Index: modules/mpm/mpmt_pthread/mpmt_pthread.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.88
diff -u -d -b -r1.88 mpmt_pthread.c
--- mpmt_pthread.c	2000/06/12 23:02:57	1.88
+++ mpmt_pthread.c	2000/06/19 19:57:01
@@ -1386,7 +1386,8 @@
                     " lowering MaxClients to %d.  To increase, please "
                     "see the", HARD_SERVER_LIMIT);
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                    " HARD_SERVER_LIMIT define in src/include/httpd.h.");
+                    " HARD_SERVER_LIMIT define in %s.",
+                    AP_MPM_HARD_LIMITS_FILE);
        ap_daemons_limit = HARD_SERVER_LIMIT;
     } 
     else if (ap_daemons_limit < 1) {
@@ -1411,9 +1412,10 @@
                      HARD_THREAD_LIMIT);
         ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
                      " lowering ThreadsPerChild to %d. To increase, please"
-                     "see the", HARD_THREAD_LIMIT);
+                     " see the", HARD_THREAD_LIMIT);
         ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                     " HARD_THREAD_LIMIT define in src/include/httpd.h.");
+                     " HARD_THREAD_LIMIT define in %s.",
+                     AP_MPM_HARD_LIMITS_FILE);
     }
     else if (ap_threads_per_child < 1) {
 	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
Index: modules/mpm/prefork/prefork.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.101
diff -u -d -b -r1.101 prefork.c
--- prefork.c	2000/06/12 23:02:58	1.101
+++ prefork.c	2000/06/19 19:57:01
@@ -1728,7 +1728,8 @@
                     " lowering MaxClients to %d.  To increase, please "
                     "see the", HARD_SERVER_LIMIT);
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
-                    " HARD_SERVER_LIMIT define in src/include/httpd.h.");
+                    " HARD_SERVER_LIMIT define in %s.",
+                    AP_MPM_HARD_LIMITS_FILE);
        ap_daemons_limit = HARD_SERVER_LIMIT;
     } 
     else if (ap_daemons_limit < 1) {
Index: modules/mpm/spmt_os2/spmt_os2.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
retrieving revision 1.44
diff -u -d -b -r1.44 spmt_os2.c
--- spmt_os2.c	2000/06/12 18:07:40	1.44
+++ spmt_os2.c	2000/06/19 19:57:02
@@ -1575,7 +1575,8 @@
                     " lowering MaxClients to %d.  To increase, please "
                     "see the", HARD_SERVER_LIMIT);
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                    " HARD_SERVER_LIMIT define in src/include/httpd.h.");
+                    " HARD_SERVER_LIMIT define in %s.",
+                    AP_MPM_HARD_LIMITS_FILE);
        ap_daemons_limit = HARD_SERVER_LIMIT;
     } 
     else if (ap_daemons_limit < 1) {
Index: modules/mpm/winnt/mpm_winnt.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/winnt/mpm_winnt.c,v
retrieving revision 1.78
diff -u -d -b -r1.78 mpm_winnt.c
--- mpm_winnt.c	2000/06/12 18:07:43	1.78
+++ mpm_winnt.c	2000/06/19 19:57:02
@@ -2209,8 +2209,8 @@
                      HARD_THREAD_LIMIT);
         ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
                      " lowering ThreadsPerChild to %d. To increase, please"
-                     " see the  HARD_THREAD_LIMIT define in src/include/httpd.h.", 
-                     HARD_THREAD_LIMIT);
+                     " see the  HARD_THREAD_LIMIT define in %s.", 
+                     HARD_THREAD_LIMIT, AP_MPM_HARD_LIMITS_FILE);
     }
     else if (ap_threads_per_child < 1) {
 	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

Mime
View raw message