BUG/MINOR: cli: shows correct mode in "show sess"
authorWilliam Lallemand <wlallemand@haproxy.org>
Tue, 8 Mar 2022 11:05:31 +0000 (12:05 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Thu, 10 Mar 2022 09:45:35 +0000 (10:45 +0100)
The "show sess" cli command only handles "http" or "tcp" as a fallback
mode, replace this by a call to proxy_mode_str() to show all the modes.

Could be backported in every maintained versions.

(cherry picked from commit b0dfd099c56b8f8fd46686120a6cf1598bd5e470)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

src/stream.c

index 628bdf5..2a6ecb2 100644 (file)
@@ -3174,7 +3174,7 @@ static int stats_dump_full_strm_to_buffer(struct stream_interface *si, struct st
 
                chunk_appendf(&trash,
                             "  frontend=%s (id=%u mode=%s), listener=%s (id=%u)",
-                            strm_fe(strm)->id, strm_fe(strm)->uuid, strm_fe(strm)->mode ? "http" : "tcp",
+                            strm_fe(strm)->id, strm_fe(strm)->uuid, proxy_mode_str(strm_fe(strm)->mode),
                             strm_li(strm) ? strm_li(strm)->name ? strm_li(strm)->name : "?" : "?",
                             strm_li(strm) ? strm_li(strm)->luid : 0);
 
@@ -3197,7 +3197,7 @@ static int stats_dump_full_strm_to_buffer(struct stream_interface *si, struct st
                        chunk_appendf(&trash,
                                     "  backend=%s (id=%u mode=%s)",
                                     strm->be->id,
-                                    strm->be->uuid, strm->be->mode ? "http" : "tcp");
+                                    strm->be->uuid, proxy_mode_str(strm->be->mode));
                else
                        chunk_appendf(&trash, "  backend=<NONE> (id=-1 mode=-)");