Mailing List Archive

mjc 96/04/02 02:16:37

Modified: src mod_status.c
Log:
Changes to mod_status HTML to make it look better

Revision Changes Path
1.8 +11 -9 apache/src/mod_status.c

Index: mod_status.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_status.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** mod_status.c 1996/04/01 23:03:30 1.7
--- mod_status.c 1996/04/02 10:16:33 1.8
***************
*** 187,193 ****
NULL);
rputs("Server up for: ",r);
show_time(r,up_time);
! rputs("<hr>",r);
}

sync_scoreboard_image();
--- 187,193 ----
NULL);
rputs("Server up for: ",r);
show_time(r,up_time);
! rputs("<p>",r);
}

sync_scoreboard_image();
***************
*** 208,226 ****
}
if(!short_report) {
rputs("</PRE>",r);
! rputs("Server States:<ul>",r);
! rputs("<li>\"<code>_</code>\" Waiting for Connection",r);
! rputs("<li>\"<code>S</code>\" Starting up",r);
! rputs("<li>\"<code>R</code>\" Reading Request",r);
! rputs("<li>\"<code>W</code>\" Sending Reply</ul>",r);
}
if (short_report)
sprintf(buffer,"\nBusyServers: %d\nIdleServers: %d\n",busy,ready);
else
! sprintf(buffer,"\n%d requests currently being processed,\n %d idle servers\n\n",busy,ready);
rputs(buffer,r);

#ifdef STATUS_INSTRUMENTATION
for (i = 0; i<HARD_SERVER_MAX; ++i) {
score_record=get_scoreboard_info(i);
lres = score_record.access_count;
--- 208,228 ----
}
if(!short_report) {
rputs("</PRE>",r);
! rputs("Key: ",r);
! rputs("\"<code>_</code>\" Waiting for Connection, ",r);
! rputs("\"<code>S</code>\" Starting up, ",r);
! rputs("\"<code>R</code>\" Reading Request, ",r);
! rputs("\"<code>W</code>\" Sending Reply<p>",r);
}
if (short_report)
sprintf(buffer,"\nBusyServers: %d\nIdleServers: %d\n",busy,ready);
else
! sprintf(buffer,"\n%d requests currently being processed,\n %d idle servers\n",busy,ready);
rputs(buffer,r);

#ifdef STATUS_INSTRUMENTATION
+ if (!short_report)
+ rputs("<hr><h2>Server Details</h2>",r);
for (i = 0; i<HARD_SERVER_MAX; ++i) {
score_record=get_scoreboard_info(i);
lres = score_record.access_count;
***************
*** 229,235 ****
my_bytes= score_record.my_bytes_served;
if (lres!=0 || (score_record.status != SERVER_READY && score_record.status != SERVER_DEAD)) {
if (!short_report) {
! sprintf(buffer,"<br>Server %d (%d): %ld|%ld [",
i,(int)score_record.pid,my_lres,lres);
rputs(buffer,r);

--- 231,237 ----
my_bytes= score_record.my_bytes_served;
if (lres!=0 || (score_record.status != SERVER_READY && score_record.status != SERVER_DEAD)) {
if (!short_report) {
! sprintf(buffer,"<b>Server %d</b> (%d): %ld|%ld [",
i,(int)score_record.pid,my_lres,lres);
rputs(buffer,r);

***************
*** 261,267 ****
rputs("|",r);
format_byte_out(r,bytes);
rputs(")",r);
! sprintf(buffer," %s {%s}", score_record.client,
score_record.request);
rputs(buffer,r);
}
--- 263,269 ----
rputs("|",r);
format_byte_out(r,bytes);
rputs(")",r);
! sprintf(buffer," <i>%s {%s}</i><br>", score_record.client,
score_record.request);
rputs(buffer,r);
}