aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2017-09-17 13:29:14 -0400
committerWaqas Hussain <waqas20@gmail.com>2017-09-17 13:29:14 -0400
commite846b05a9422549246704855750f0d04efc751ca (patch)
treeb28232ac40efde3e1ea7371c3fa530488a0d4ca9
parentf1180275589adb35c13652ba60deedc5b5c83b06 (diff)
downloadprosody-e846b05a9422549246704855750f0d04efc751ca.tar.gz
prosody-e846b05a9422549246704855750f0d04efc751ca.zip
util.throttle: Fix initial time setting (double accounting the first time) and fractional balance updates (0.1*10 was not the same as 1*1)
-rw-r--r--util/throttle.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/throttle.lua b/util/throttle.lua
index 18692a8a..a8191886 100644
--- a/util/throttle.lua
+++ b/util/throttle.lua
@@ -12,7 +12,7 @@ function throttle:update()
local newt = gettime();
local elapsed = newt - self.t;
self.t = newt;
- local balance = floor(self.rate * elapsed) + self.balance;
+ local balance = (self.rate * elapsed) + self.balance;
if balance > self.max then
self.balance = self.max;
else
@@ -40,7 +40,7 @@ function throttle:poll(cost, split)
end
local function create(max, period)
- return setmetatable({ rate = max / period, max = max, t = 0, balance = max }, throttle_mt);
+ return setmetatable({ rate = max / period, max = max, t = gettime(), balance = max }, throttle_mt);
end
return {