summaryrefslogtreecommitdiffstats
path: root/modules/generators
diff options
context:
space:
mode:
authorRainer Jung <rjung@apache.org>2018-08-07 12:25:31 +0200
committerRainer Jung <rjung@apache.org>2018-08-07 12:25:31 +0200
commitb2f8c1164156a6245e559b1de8ab024612d0fda2 (patch)
tree0c8e3d1077735ecc0505b75d063828ee110ad4be /modules/generators
parentmod_proxy: Improve the balancer member data shown (diff)
downloadapache2-b2f8c1164156a6245e559b1de8ab024612d0fda2.tar.xz
apache2-b2f8c1164156a6245e559b1de8ab024612d0fda2.zip
mod_status: Complete the data shown for async
MPMs in "auto" mode. Added number of processes, number of stopping processes and number of busy and idle workers. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1837589 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/generators')
-rw-r--r--modules/generators/mod_status.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 3b89350321..490e9e8615 100644
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -557,16 +557,18 @@ static int status_handler(request_rec *r)
lingering_close += ps_record->lingering_close;
busy_workers += thread_busy_buffer[i];
idle_workers += thread_idle_buffer[i];
+ procs++;
+ if (ps_record->quiescing) {
+ stopping++;
+ }
if (!short_report) {
const char *dying = "no";
const char *old = "";
if (ps_record->quiescing) {
dying = "yes";
- stopping++;
}
if (ps_record->generation != mpm_generation)
old = " (old gen)";
- procs++;
ap_rprintf(r, "<tr><td>%u</td><td>%" APR_PID_T_FMT "</td>"
"<td>%s%s</td>"
"<td>%u</td><td>%s</td>"
@@ -598,12 +600,18 @@ static int status_handler(request_rec *r)
write_completion, keep_alive, lingering_close);
}
else {
- ap_rprintf(r, "ConnsTotal: %d\n"
+ ap_rprintf(r, "Processes: %d\n"
+ "Stopping: %d\n"
+ "BusyWorkers: %d\n"
+ "IdleWorkers: %d\n"
+ "ConnsTotal: %d\n"
"ConnsAsyncWriting: %d\n"
"ConnsAsyncKeepAlive: %d\n"
"ConnsAsyncClosing: %d\n",
- connections, write_completion, keep_alive,
- lingering_close);
+ procs, stopping,
+ busy_workers, idle_workers,
+ connections,
+ write_completion, keep_alive, lingering_close);
}
}