grazer · December 22, 2015 17:19 · Oct 4, 2013 · Sep 10, 2013 · Sep 10, 2013
diff --git a/token bucket b/token bucket
@@ -7,7 +7,7 @@ class TokenBucket(msgPerSecond:Long, bucketSize:Long) {
         val current = System.currentTimeMillis
         val delta = current-prev
         prev = current
-        tokens += delta/1000 * msgPerSecond
+        tokens += delta/1000.0 * msgPerSecond
         if (tokens > bucketSize) 
             tokens = bucketSize
         if (tokens > 0) 

diff --git a/token bucket b/token bucket
@@ -16,3 +16,15 @@ class TokenBucket(msgPerSecond:Long, bucketSize:Long) {
         tokens -= 1
     }
 }
+
+scala>  var tb = new TokenBucket(10, 6)
+tb: TokenBucket = TokenBucket@5c2f4f8b
+
+scala> (1 to 10) foreach( i => tb.limit { println(i) })
+1
+2
+3
+4
+5
+6
+
diff --git a/token bucket b/token bucket
@@ -0,0 +1,18 @@
+class TokenBucket(msgPerSecond:Long, bucketSize:Long) {
+
+    var prev = 0L
+    var tokens = bucketSize
+
+    def limit(func: => Any): Any = {
+        val current = System.currentTimeMillis
+        val delta = current-prev
+        prev = current
+        tokens += delta/1000 * msgPerSecond
+        if (tokens > bucketSize) 
+            tokens = bucketSize
+        if (tokens > 0) 
+            func
+
+        tokens -= 1
+    }
+}