From 52af695859d241e27b8547cd7b9a3cd584a23d9f Mon Sep 17 00:00:00 2001 From: Will Richard Date: Tue, 12 Apr 2016 16:07:35 -0400 Subject: [PATCH] Add a parameter to disable the multicollins cache --- app/collins/models/RemoteAssetFinder.scala | 4 +++- app/collins/util/config/MultiCollinsConfig.scala | 1 + conf/reference/multicollins_reference.conf | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/collins/models/RemoteAssetFinder.scala b/app/collins/models/RemoteAssetFinder.scala index bd8aeca2f..3a635ca21 100644 --- a/app/collins/models/RemoteAssetFinder.scala +++ b/app/collins/models/RemoteAssetFinder.scala @@ -285,7 +285,9 @@ object RemoteAssetFinder { val stream = Cache.getAs[RemoteAssetStream](key).getOrElse(new RemoteAssetStream(clients, searchParams)) val results = stream.slice(pageParams.page * pageParams.size, (pageParams.page + 1) * (pageParams.size)) val timeout = MultiCollinsConfig.queryCacheTimeout - Cache.set(key, stream, timeout) + if (MultiCollinsConfig.cacheEnabled) { + Cache.set(key, stream, timeout) + } (results, stream.aggregateTotal) } diff --git a/app/collins/util/config/MultiCollinsConfig.scala b/app/collins/util/config/MultiCollinsConfig.scala index c04163ac2..91e357f2a 100644 --- a/app/collins/util/config/MultiCollinsConfig.scala +++ b/app/collins/util/config/MultiCollinsConfig.scala @@ -19,6 +19,7 @@ object MultiCollinsConfig extends Configurable { def locationAttribute = getString("locationAttribute", "LOCATION") def thisInstance = getString("thisInstance") def queryCacheTimeout = getInt("queryCacheTimeout", 30) + def cacheEnabled = getBoolean("cacheEnabled", true) override def validateConfig() { if (enabled) { diff --git a/conf/reference/multicollins_reference.conf b/conf/reference/multicollins_reference.conf index f9be8a49d..bb75f18c4 100644 --- a/conf/reference/multicollins_reference.conf +++ b/conf/reference/multicollins_reference.conf @@ -4,4 +4,5 @@ multicollins { locationAttribute = LOCATION thisInstance = NONE queryCacheTimeout = 30 + cacheEnabled = true }