You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gr...@apache.org on 2002/05/24 22:15:07 UTC
cvs commit: httpd-2.0/modules/generators mod_status.c
gregames 02/05/24 13:15:07
Modified: modules/generators mod_status.c
Log:
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.
Revision Changes Path
1.69 +5 -3 httpd-2.0/modules/generators/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mod_status.c 17 May 2002 11:33:09 -0000 1.68
+++ mod_status.c 24 May 2002 20:15:07 -0000 1.69
@@ -347,11 +347,13 @@
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++;
}