]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: map/dumpstats: The cli cmd "get map ..." display the "int" format.
authorThierry FOURNIER <tfournier@exceliance.fr>
Fri, 17 Jan 2014 14:14:41 +0000 (15:14 +0100)
committerWilly Tarreau <w@1wt.eu>
Mon, 17 Mar 2014 17:06:07 +0000 (18:06 +0100)
The "get map ..." command display the integer range that match the
request.

src/dumpstats.c

index 2532472925dfd7edb8ad550bf99011b2d2e9b203..12bace2f5b6c502d276c7b3b11f39047105dacde 100644 (file)
@@ -4941,6 +4941,23 @@ static int stats_map_lookup(struct stream_interface *si)
                                                        chunk_appendf(&trash, ", key=\"%s/%d\"", s_addr6, pat->val.ipv6.mask);
                                        }
                                }
+                               else if (appctx->ctx.map.desc->pat->match == pat_match_int) {
+                                       /* display int */
+                                       chunk_appendf(&trash, "match=\"");
+                                       if (pat->val.range.min_set && pat->val.range.max_set &&
+                                           pat->val.range.min == pat->val.range.max) {
+                                               chunk_appendf(&trash, "%lld", pat->val.range.min);
+                                       }
+                                       else {
+                                               if (pat->val.range.min_set)
+                                                       chunk_appendf(&trash, "is >= %lld", pat->val.range.min);
+                                               if (pat->val.range.min_set && pat->val.range.max_set)
+                                                       chunk_appendf(&trash, " and ");
+                                               if (pat->val.range.max_set)
+                                                       chunk_appendf(&trash, "is <= %lld", pat->val.range.max);
+                                       }
+                                       chunk_appendf(&trash, "\", ");
+                               }
                        }
 
                        /* display return value */