jim 99/01/15 09:48:54
Modified: src CHANGES
src/modules/standard mod_status.c
Log:
Some mod_status changes... It's useful to know
both the value of ap_my_generation as well as the generation of each
httpd child process, so we print this out now. Also, '?notable' didn't
print out the vhost info, which didn't make sense to me :)
Revision Changes Path
1.1213 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1212
retrieving revision 1.1213
diff -u -r1.1212 -r1.1213
--- CHANGES 1999/01/12 15:46:56 1.1212
+++ CHANGES 1999/01/15 17:48:44 1.1213
@@ -1,5 +1,9 @@
Changes with Apache 1.3.5
+ *) The status module now prints out both the main server generation as
+ well as the generation of each process. Also, the vhost info is
+ printed with '?notable'. [Jim Jagielski]
+
*) Move src/main/md5c.c to src/ap/ap_md5c.c; it's httpd-neutral
and this makes its functions available to things in src/support.
[Ken Coar]
1.105 +24 -12 apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- mod_status.c 1999/01/01 19:05:14 1.104
+++ mod_status.c 1999/01/15 17:48:53 1.105
@@ -353,6 +353,7 @@
ap_rvputs(r, "Restart Time: ",
ap_ht_time(r->pool, ap_restart_time, DEFAULT_TIME_FORMAT, 0),
"<br>\n", NULL);
+ ap_rprintf(r, "Server Generation: %d <br>\n", (int) ap_my_generation);
ap_rputs("Server uptime: ", r);
show_time(r, up_time);
ap_rputs("<br>\n", r);
@@ -527,11 +528,16 @@
if (!short_report) {
if (no_table_report) {
if (score_record.status == SERVER_DEAD)
- ap_rprintf(r, "<b>Server %d</b> (-): %d|%lu|%lu [",
- i, (int) conn_lres, my_lres, lres);
+ ap_rprintf(r,
+ "<b>Server %d-%d</b> (-): %d|%lu|%lu [",
+ i, (int) ps_record.generation, (int) conn_lres,
+ my_lres, lres);
else
- ap_rprintf(r, "<b>Server %d</b> (%d): %d|%lu|%lu [",
- i, (int) ps_record.pid, (int) conn_lres,
my_lres, lres);
+ ap_rprintf(r,
+ "<b>Server %d-%d</b> (%d): %d|%lu|%lu [",
+ i, (int) ps_record.generation,
+ (int) ps_record.pid,
+ (int) conn_lres, my_lres, lres);
switch (score_record.status) {
case SERVER_READY:
@@ -588,17 +594,23 @@
ap_rputs("|", r);
format_byte_out(r, bytes);
ap_rputs(")\n", r);
- ap_rprintf(r, " <i>%s {%s}</i><br>\n\n",
- score_record.client,
- ap_escape_html(r->pool, score_record.request));
+ ap_rprintf(r, " <i>%s {%s}</i> <b>[%s]</b><br>\n\n",
+ score_record.client,
+ ap_escape_html(r->pool, score_record.request),
+ vhost ? vhost->server_hostname : "(unavailable)");
}
else { /* !no_table_report */
if (score_record.status == SERVER_DEAD)
- ap_rprintf(r,
"<tr><td><b>%d</b><td>-<td>%d/%lu/%lu",
- i, (int) conn_lres, my_lres, lres);
+ ap_rprintf(r,
+ "<tr><td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
+ i, (int) ps_record.generation,
+ (int) conn_lres, my_lres, lres);
else
- ap_rprintf(r,
"<tr><td><b>%d</b><td>%d<td>%d/%lu/%lu",
- i, (int) ps_record.pid, (int) conn_lres,
my_lres, lres);
+ ap_rprintf(r,
+ "<tr><td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
+ i, (int) ps_record.generation,
+ (int) ps_record.pid, (int) conn_lres,
+ my_lres, lres);
switch (score_record.status) {
case SERVER_READY:
@@ -670,7 +682,7 @@
ap_rputs("</table>\n \
<hr> \
<table>\n \
-<tr><th>Srv<td>Server number\n \
+<tr><th>Srv<td>Server number - generation\n \
<tr><th>PID<td>OS process ID\n \
<tr><th>Acc<td>Number of accesses this connection / this child / this slot\n
\
<tr><th>M<td>Mode of operation\n \
