fix read config from path. We were mixing config path with zookeeper …

…path fix lockpath and add repository visibility
dvallejo · Mar 10, 2017 · 21e4b6f · 21e4b6f
1 parent c47eecf
commit 21e4b6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...la/com/stratio/common/utils/components/repository/impl/ZookeeperRepositoryComponent.scala b/...la/com/stratio/common/utils/components/repository/impl/ZookeeperRepositoryComponent.scala
@@ -111,7 +111,7 @@ trait ZookeeperRepositoryComponent extends RepositoryComponent[String, Array[Byt
       )
 
     def getZookeeperConfig: Config = {
-      config.getConfig(path.getOrElse(ConfigZookeeper))
+      config.getConfig(ConfigZookeeper)
         .getOrElse(throw new ZookeeperRepositoryException(s"Zookeeper config not found"))
     }
 

diff --git a/...ls/components/transaction_manager/impl/ZookeeperRepositoryWithTransactionsComponent.scala b/...ls/components/transaction_manager/impl/ZookeeperRepositoryWithTransactionsComponent.scala
@@ -27,6 +27,8 @@ trait ZookeeperRepositoryWithTransactionsComponent extends ZookeeperRepositoryCo
 
   self: ConfigComponent with LoggerComponent =>
 
+  override val repository: ZookeeperRepositoryWithTransactions = new ZookeeperRepositoryWithTransactions(None)
+
   class ZookeeperRepositoryWithTransactions(path: Option[String] = None) extends ZookeeperRepository(path)
     with TransactionalRepository {
 
@@ -70,7 +72,7 @@ trait ZookeeperRepositoryWithTransactionsComponent extends ZookeeperRepositoryCo
     }
 
     private def lockPath(entity: String)(resource: TransactionResource): String = {
-      s"$entity/locks"
+      s"$entity/locks/${resource.id}"
     }
 
     override def atomically[T](