]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
projects / thirdparty / haproxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 88a14af)
[BUG] stats: show UP/DOWN status also in tracking servers
authorKrzysztof Piotr Oledzki <ole@ans.pl>
Tue, 5 Jan 2010 17:44:44 +0000 (18:44 +0100)
committerWilly Tarreau <w@1wt.eu>
Tue, 5 Jan 2010 23:28:07 +0000 (00:28 +0100)
It was broken since 0960541e496167f4cc5f89f114e027bf8f7f1ff0:
 [MEDIUM] Collect & show information about last health check, v3

src/dumpstats.c patch | blob | blame | history

diff --git a/src/dumpstats.c b/src/dumpstats.c
index 65f6a1c6fef5b8178580b911179a70248036571d..a9422e2e04d447fc3d0c932c95a85c6771029aca 100644 (file)
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -921,7 +921,7 @@ int stats_dump_http(struct session *s, struct buffer *rep, struct uri_auth *uri)
 
        case DATA_ST_HEAD:
                if (!(s->data_ctx.stats.flags & STAT_FMT_CSV)) {
-                       /* WARNING! This must fit in the first buffer !!! */        
+                       /* WARNING! This must fit in the first buffer !!! */
                        chunk_printf(&msg,
                             "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n"
                             "\"http://www.w3.org/TR/html4/loose.dtd\">\n"
@@ -1676,7 +1676,7 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
                                /* status, lest check */
                                chunk_printf(&msg, "<td class=ac>");
 
-                               if (sv->state & SRV_CHECKED) {
+                               if (svs->state & SRV_CHECKED) {
                                        chunk_printf(&msg, "%s ",
                                                human_time(now.tv_sec - sv->last_change, 1));
 
@@ -1684,7 +1684,9 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
                                             srv_hlt_st[sv_state],
                                             (svs->state & SRV_RUNNING) ? (svs->health - svs->rise + 1) : (svs->health),
                                             (svs->state & SRV_RUNNING) ? (svs->fall) : (svs->rise));
+                               }
 
+                               if (sv->state & SRV_CHECKED) {
                                        chunk_printf(&msg, "</td><td class=ac title=\"%s",
                                                get_check_status_description(sv->check_status));
 
@@ -1696,7 +1698,7 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
                                                chunk_initlen(&src, sv->check_desc, 0, strlen(sv->check_desc));
                                                chunk_htmlencode(&msg, &src);
                                        }
-                               
+
                                        chunk_printf(&msg, "\"> %s%s",
                                                tv_iszero(&sv->check_start)?"":"* ",
                                                get_check_status_info(sv->check_status));
@@ -1705,10 +1707,9 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
                                                chunk_printf(&msg, "/%d", sv->check_code);
 
                                        if (sv->check_status >= HCHK_STATUS_CHECKED && sv->check_duration >= 0)
-                                               chunk_printf(&msg, " in %lums", sv->check_duration);
-                               } else {
+                                       chunk_printf(&msg, " in %lums", sv->check_duration);
+                               } else
                                        chunk_printf(&msg, "</td><td>");
-                               }
 
                                chunk_printf(&msg,
                                     /* weight */
@@ -1851,7 +1852,7 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
                                                chunk_printf(&msg, ",");
 
                                        /* check_duration */
-                                       if (sv->check_status >= HCHK_STATUS_CHECKED)    
+                                       if (sv->check_status >= HCHK_STATUS_CHECKED)
                                                chunk_printf(&msg, "%lu,", sv->check_duration);
                                        else
                                                chunk_printf(&msg, ",");
Mirror of https://github.com/haproxy/haproxy.git