From d7c369a57dbfb1532dd6b3566a43d7b61e3cc3dc Mon Sep 17 00:00:00 2001 From: Greg Ames Date: Fri, 24 May 2002 20:15:07 +0000 Subject: [PATCH] tweak "requests currently being processed". It is confusing to not have old generation requests included after a graceful restart. But we shouldn't count workers who are starting up. OTOH, the "ready" counter needs to pay attention to the generation, so it stays in sync with how p_i_s_m counts idle workers. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95272 13f79535-47bb-0310-9956-ffa450edef68 --- modules/generators/mod_status.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c index 7c258e7965..ceb923718b 100644 --- a/modules/generators/mod_status.c +++ b/modules/generators/mod_status.c @@ -347,11 +347,13 @@ static int status_handler(request_rec *r) stat_buffer[indx] = status_flags[res]; if (!ps_record->quiescing - && ps_record->generation == ap_my_generation && ps_record->pid) { - if (res == SERVER_READY) + if (res == SERVER_READY + && ps_record->generation == ap_my_generation) ready++; - else if (res != SERVER_DEAD && res != SERVER_IDLE_KILL) + else if (res != SERVER_DEAD && + res != SERVER_STARTING && + res != SERVER_IDLE_KILL) busy++; } -- 2.40.0