Merge pull request #437 from tumblr/will-option-to-disable-multicolli…

…ns-cache Add a parameter to disable the multicollins cache
tumblr · Apr 19, 2016 · 8c02e52 · 8c02e52
2 parents a323935 + 52af695
commit 8c02e52
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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
@@ -4,4 +4,5 @@ multicollins {
   locationAttribute = LOCATION
   thisInstance = NONE
   queryCacheTimeout = 30
+  cacheEnabled = true
 }