From 9e073661fe017b767cfd5f5eadf730a5b453476d Mon Sep 17 00:00:00 2001
From: jeyrs <jeyrschabu@gmail.com>
Date: Mon, 4 Jun 2018 18:04:51 -0700
Subject: [PATCH] fix(locking): duration in millis and not seconds

- also prefer bean creation in config for locking service
---
 .../com/netflix/spinnaker/swabbie/LockingService.kt  |  9 +++------
 .../spinnaker/swabbie/redis/LockingConfiguration.kt  | 12 ++++++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/LockingService.kt b/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/LockingService.kt
index e0d1bd18..fa9e42fc 100644
--- a/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/LockingService.kt
+++ b/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/LockingService.kt
@@ -2,15 +2,12 @@ package com.netflix.spinnaker.swabbie
 
 import com.netflix.spinnaker.config.LockingConfigurationProperties
 import com.netflix.spinnaker.kork.lock.LockManager
-import org.springframework.stereotype.Component
 import java.time.Duration
 
-
-@Component
 class LockingService(
-  private val lockingConfigurationProperties: LockingConfigurationProperties,
-  private val lockManager: LockManager
+  private val lockManager: LockManager,
+  private val lockingConfigurationProperties: LockingConfigurationProperties
 ) : LockManager by lockManager {
   val swabbieMaxLockDuration: Duration
-    get() = Duration.ofSeconds(lockingConfigurationProperties.maximumLockDurationMillis!!)
+    get() = Duration.ofMillis(lockingConfigurationProperties.maximumLockDurationMillis!!)
 }
diff --git a/swabbie-redis/src/main/kotlin/com/netflix/spinnaker/swabbie/redis/LockingConfiguration.kt b/swabbie-redis/src/main/kotlin/com/netflix/spinnaker/swabbie/redis/LockingConfiguration.kt
index 0004de49..8d6a81f0 100644
--- a/swabbie-redis/src/main/kotlin/com/netflix/spinnaker/swabbie/redis/LockingConfiguration.kt
+++ b/swabbie-redis/src/main/kotlin/com/netflix/spinnaker/swabbie/redis/LockingConfiguration.kt
@@ -21,12 +21,13 @@ import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.config.LockingConfigurationProperties
 import com.netflix.spinnaker.kork.jedis.RedisClientDelegate
 import com.netflix.spinnaker.kork.jedis.lock.RedisLockManager
+import com.netflix.spinnaker.kork.lock.LockManager
+import com.netflix.spinnaker.swabbie.LockingService
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import java.time.Clock
-import java.time.Duration
 import java.util.*
 
 @Configuration
@@ -35,6 +36,12 @@ import java.util.*
 open class LockingConfiguration(
   private val lockingConfigurationProperties: LockingConfigurationProperties
 ) {
+
+  @Bean
+  open fun lockingService(lockManager: LockManager): LockingService {
+    return LockingService(lockManager, lockingConfigurationProperties)
+  }
+
   @Bean
   open fun lockManager(
     clock: Clock,
@@ -52,8 +59,5 @@ open class LockingConfiguration(
       Optional.of(lockingConfigurationProperties.leaseDurationMillis)
     )
   }
-
-  internal val RedisLockManager.swabbieLockDuration: Duration
-    get() = Duration.ofSeconds(lockingConfigurationProperties.maximumLockDurationMillis!!)
 }