Commit d5551bd1 authored by Greg Ames's avatar Greg Ames
Browse files

decouple the two scoreboard full messages 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394116 13f79535-47bb-0310-9956-ffa450edef68
parent 9f4584eb

server/mpm/experimental/event/event.c

+5 −6
Changes for server/mpm/experimental/event/event.c: 5 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -1800,24 +1800,23 @@ static void perform_idle_server_maintenance(void) 
    else if (idle_thread_count < min_spare_threads) {

        /* terminate the free list */

        if (free_length == 0) { /* scoreboard is full, can't fork */

            /* only report this condition once */

            static int reported = 0;



            if (active_thread_count >= ap_daemons_limit * ap_threads_per_child) {

                static int reported = 0;

                if (!reported) {

                if (active_thread_count >=

                        ap_daemons_limit * ap_threads_per_child) {

                    /* only report this condition once */

                    ap_log_error(APLOG_MARK, APLOG_ERR, 0,

                                 ap_server_conf,

                                 "server reached MaxClients setting, consider"

                                 " raising the MaxClients setting");

                    reported = 1;

                }

            }

            else {

                ap_log_error(APLOG_MARK, APLOG_ERR, 0,

                             ap_server_conf,

                             "scoreboard is full, not at MaxClients");

            }

                reported = 1;

            }

            idle_spawn_rate = 1;

        }

        else {

server/mpm/worker/worker.c

+5 −6
Changes for server/mpm/worker/worker.c: 5 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -1492,24 +1492,23 @@ static void perform_idle_server_maintenance(void) 
    else if (idle_thread_count < min_spare_threads) {

        /* terminate the free list */

        if (free_length == 0) { /* scoreboard is full, can't fork */

            /* only report this condition once */

            static int reported = 0;



            if (active_thread_count >= ap_daemons_limit * ap_threads_per_child) { 

                static int reported = 0;

                if (!reported) {

                if (active_thread_count >= 

                        ap_daemons_limit * ap_threads_per_child) { 

                    /* only report this condition once */

                    ap_log_error(APLOG_MARK, APLOG_ERR, 0,

                                 ap_server_conf,

                                 "server reached MaxClients setting, consider"

                                 " raising the MaxClients setting");

                    reported = 1;

                }

            }

            else {

                ap_log_error(APLOG_MARK, APLOG_ERR, 0,

                             ap_server_conf,

                             "scoreboard is full, not at MaxClients");

            }

                reported = 1;

            }

            idle_spawn_rate = 1;

        }

        else {