From: Greg Ames <gregames@apache.org>
Date: Tue, 31 Jul 2001 05:35:06 +0000 (+0000)
Subject: mod_status:  don't include workers from dead or quiescing processes in the
X-Git-Tag: 2.0.23~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d45e86271418e03a1fcb71d468e9d203e4eb810c;p=apache

mod_status:  don't include workers from dead or quiescing processes in the
"requests currently being processed" or "idle" counts

also, change term from "servers" to "workers" - servers sounds like what
you call the whole thing


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

diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 6c041d05fd..226b0662f2 100644
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -321,10 +321,15 @@ static int status_handler(request_rec *r)
 	    ps_record = ap_scoreboard_image->parent[i];
 	    res = ws_record.status;
 	    stat_buffer[indx] = status_flags[res];
-	    if (res == SERVER_READY)
-	        ready++;
-	    else if (res != SERVER_DEAD && res != SERVER_IDLE_KILL)
-	        busy++;
+            if (!ps_record.quiescing && ps_record.pid) {
+	        if (res == SERVER_READY)
+	            ready++;
+	        else if (res != SERVER_DEAD && res != SERVER_IDLE_KILL)
+	            busy++;
+            }
+            /* XXX what about the counters for quiescing/seg faulted
+             * processes?  should they be counted or not?  GLA
+             */
 	    if (ap_extended_status) {
 	        lres = ws_record.access_count;
 	        bytes = ws_record.bytes_served;
@@ -432,10 +437,10 @@ static int status_handler(request_rec *r)
     }					/* ap_extended_status */
 
     if (!short_report)
-	ap_rprintf(r, "<dt>%d requests currently being processed, %d idle servers</dt>\n"
+	ap_rprintf(r, "<dt>%d requests currently being processed, %d idle workers</dt>\n"
 		,busy, ready);
     else
-	ap_rprintf(r, "BusyServers: %d\nIdleServers: %d\n", busy, ready);
+	ap_rprintf(r, "BusyWorkers: %d\nIdleWorkers: %d\n", busy, ready);
 
     /* send the scoreboard 'table' out */