Re: [PATCH][BUG] session rate limit gets garbaged in the stats

2010-07-23 Thread Willy Tarreau
Hi Cyril,

On Fri, Jul 23, 2010 at 06:59:11PM +0200, Cyril Bonté wrote:
> The statistics page (the HTML one) displays a garbage value on frontends 
> using 
> "rate-limit session" in HTTP mode.
> 
> This is due to the usage of the same buffer for the macros converting the max 
> session rate and the limit.

Hey, good catch! I never observed that although I often use rate-limit.

I'll merge that ASAP.

Thanks Cyril!
Willy




[PATCH][BUG] session rate limit gets garbaged in the stats

2010-07-23 Thread Cyril Bonté
The statistics page (the HTML one) displays a garbage value on frontends using 
"rate-limit session" in HTTP mode.

This is due to the usage of the same buffer for the macros converting the max 
session rate and the limit.

Steps to reproduce :
Configuration file example  :
listen bug :80
  mode http
  rate-limit sessions
  stats enable

Then start refreshing the statistics page.

This bug was introduced just before the release of haproxy 1.4.0.

--
Cyril Bonté.
diff -Naur haproxy-1.4.8/src/dumpstats.c haproxy-1.4.8-stats/src/dumpstats.c
--- haproxy-1.4.8/src/dumpstats.c	2010-06-16 22:57:48.0 +0200
+++ haproxy-1.4.8-stats/src/dumpstats.c	2010-07-23 18:10:12.0 +0200
@@ -1438,7 +1438,7 @@
 		 read_freq_ctr(&px->fe_req_per_sec),
 		 U2H0(read_freq_ctr(&px->fe_sess_per_sec)),
 		 px->counters.fe_rps_max,
-		 U2H2(px->counters.fe_sps_max),
+		 U2H1(px->counters.fe_sps_max),
 		 LIM2A2(px->fe_sps_lim, "-"));
 } else {
 	chunk_printf(&msg,