mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] cosmetic changes in the stats interface

Browse Source
This commit is contained in:
willy tarreau 2006-05-21 08:58:06 +02:00
parent 2d505e5754
commit 338be83aea
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
haproxy.c
View File

@ -3131,11 +3131,11 @@ int produce_content(struct session *s) {
"<body><h1>" PRODUCT_NAME "</h1>\n" "<body><h1>" PRODUCT_NAME "</h1>\n"
"<h2>Statistics Report for pid %d</h2>\n" "<h2>Statistics Report for pid %d</h2>\n"
"<hr width=\"100%%\" class=\"hr\">\n" "<hr width=\"100%%\" class=\"hr\">\n"
"<h3>&gt; General process informations</h3>\n" "<h3>&gt; General process information</h3>\n"
"<table border=0><tr><td align=\"left\">\n" "<table border=0><tr><td align=\"left\">\n"
"<p><b>pid = </b> %d (nbproc = %d)<br>\n" "<p><b>pid = </b> %d (nbproc = %d)<br>\n"
"<b>uptime = </b> %dd %dh%02dm%02ds<br>\n" "<b>uptime = </b> %dd %dh%02dm%02ds<br>\n"
"<b>system limits :</b> memmax = %d Megs ; ulimit-n = %d<br>\n" "<b>system limits :</b> memmax = %s%s ; ulimit-n = %d<br>\n"
"<b>maxsock = </b> %d<br>\n" "<b>maxsock = </b> %d<br>\n"
"<b>maxconn = </b> %d (current conns = %d)<br>\n" "<b>maxconn = </b> %d (current conns = %d)<br>\n"
"</td><td width=\"10%%\">\n" "</td><td width=\"10%%\">\n"
@ -3155,7 +3155,8 @@ int produce_content(struct session *s) {
pid, pid, global.nbproc, pid, pid, global.nbproc,
up / 86400, (up % 86400) / 3600, up / 86400, (up % 86400) / 3600,
(up % 3600) / 60, (up % 60), (up % 3600) / 60, (up % 60),
global.rlimit_memmax, global.rlimit_memmax ? ultoa(global.rlimit_memmax) : "unlimited",
global.rlimit_memmax ? " MB" : "",
global.rlimit_nofile, global.rlimit_nofile,
global.maxsock, global.maxsock,
global.maxconn, global.maxconn,
@ -3261,9 +3262,13 @@ int produce_content(struct session *s) {
sv->cur_sess, sv->cur_sess_max, sv->maxconn ? ultoa(sv->maxconn) : "-", sv->cum_sess); sv->cur_sess, sv->cur_sess_max, sv->maxconn ? ultoa(sv->maxconn) : "-", sv->cum_sess);
/* failures : unique, fatal */ /* failures : unique, fatal */
msglen += snprintf(trash + msglen, sizeof(trash) - msglen, if (sv->state & SRV_CHECKED)
"<td align=right>%d</td><td align=right>%d</td></tr>\n", msglen += snprintf(trash + msglen, sizeof(trash) - msglen,
sv->failed_checks, sv->down_trans); "<td align=right>%d</td><td align=right>%d</td></tr>\n",
sv->failed_checks, sv->down_trans);
else
msglen += snprintf(trash + msglen, sizeof(trash) - msglen,
"<td align=right>-</td><td align=right>-</td></tr>\n");
sv = sv->next; sv = sv->next;
if (!sv) { if (!sv) {