Use seconds instead of millis (#28)

* Use seconds instead of millis
nryanov · May 12, 2021 · b5fcb4a · b5fcb4a
1 parent 184e2f6
commit b5fcb4a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -2,11 +2,9 @@ name: genkai CI
 
 on:
   pull_request:
-    branches:
-      - master
+    branches: ['*']
   push:
-    branches:
-      - master
+    branches: ['*']
 
 jobs:
   scalafmt:

diff --git a/modules/aerospike/src/main/scala/genkai/aerospike/AerospikeStrategy.scala b/modules/aerospike/src/main/scala/genkai/aerospike/AerospikeStrategy.scala
@@ -86,7 +86,7 @@ object AerospikeStrategy {
     private val argsPart = List(
       Value.get(underlying.tokens),
       Value.get(underlying.refillAmount),
-      Value.get(underlying.refillDelay.toMillis)
+      Value.get(underlying.refillDelay.toSeconds)
     )
 
     override val luaScript: String = LuaScript.tokenBucket
@@ -103,10 +103,10 @@ object AerospikeStrategy {
       new AKey(namespace, setName, Key[A].convert(value))
 
     override def permissionsArgs(instant: Instant): List[Value] =
-      Value.get(instant.toEpochMilli) :: argsPart
+      Value.get(instant.getEpochSecond) :: argsPart
 
     override def acquireArgs(instant: Instant, cost: Long): List[Value] =
-      Value.get(instant.toEpochMilli) :: Value.get(cost) :: argsPart
+      Value.get(instant.getEpochSecond) :: Value.get(cost) :: argsPart
 
     override def isAllowed(value: Long): Boolean = value != 0
 
@@ -141,7 +141,7 @@ object AerospikeStrategy {
     override def permissionsArgs(instant: Instant): List[Value] = permissionArgsPart
 
     override def acquireArgs(instant: Instant, cost: Long): List[Value] =
-      Value.get(instant.toEpochMilli) :: Value.get(cost) :: acquireArgsPart
+      Value.get(instant.getEpochSecond) :: Value.get(cost) :: acquireArgsPart
 
     override def isAllowed(value: Long): Boolean = value != 0
 
@@ -181,7 +181,7 @@ object AerospikeStrategy {
     override def permissionsArgs(instant: Instant): List[Value] = argsPart
 
     override def acquireArgs(instant: Instant, cost: Long): List[Value] =
-      Value.get(instant.toEpochMilli) :: Value.get(cost) :: argsPart
+      Value.get(instant.getEpochSecond) :: Value.get(cost) :: argsPart
 
     override def isAllowed(value: Long): Boolean = value != 0
 

diff --git a/modules/redis/common/src/main/scala/genkai/redis/RedisStrategy.scala b/modules/redis/common/src/main/scala/genkai/redis/RedisStrategy.scala
@@ -69,7 +69,7 @@ object RedisStrategy {
     private val argsPart = List(
       underlying.tokens.toString,
       underlying.refillAmount.toString,
-      underlying.refillDelay.toMillis.toString
+      underlying.refillDelay.toSeconds.toString
     )
 
     override val acquireLuaScript: String = LuaScript.tokenBucketAcquire
@@ -80,10 +80,10 @@ object RedisStrategy {
       List(s"token_bucket:${Key[A].convert(value)}")
 
     override def permissionsArgs(instant: Instant): List[String] =
-      instant.toEpochMilli.toString :: argsPart
+      instant.getEpochSecond.toString :: argsPart
 
     override def acquireArgs(instant: Instant, cost: Long): List[String] =
-      instant.toEpochMilli.toString :: cost.toString :: argsPart
+      instant.getEpochSecond.toString :: cost.toString :: argsPart
 
     override def isAllowed(value: Long): Boolean = value != 0
 
@@ -105,7 +105,7 @@ object RedisStrategy {
 
     override def keys[A: Key](value: A, instant: Instant): List[String] = {
 
-      val ts = instant.truncatedTo(underlying.window.unit).toEpochMilli
+      val ts = instant.truncatedTo(underlying.window.unit).getEpochSecond
       List(s"fixed_window:${Key[A].convert(value)}:$ts")
     }
 
@@ -141,10 +141,10 @@ object RedisStrategy {
       )
 
     override def permissionsArgs(instant: Instant): List[String] =
-      instant.toEpochMilli.toString :: permissionArgsPart
+      instant.getEpochSecond.toString :: permissionArgsPart
 
     override def acquireArgs(instant: Instant, cost: Long): List[String] =
-      instant.toEpochMilli.toString :: cost.toString :: acquireArgsPart
+      instant.getEpochSecond.toString :: cost.toString :: acquireArgsPart
 
     override def isAllowed(value: Long): Boolean = value != 0