[config] put cache in the DAO config.

kong-0.2.0-1.rockspec

@@ -57,7 +57,7 @@ build = {
     ["kong.tools.syslog"] = "kong/tools/syslog.lua",
     ["kong.tools.migrations"] = "kong/tools/migrations.lua",
     ["kong.tools.faker"] = "kong/tools/faker.lua",
-    ["kong.tools.cache"] = "kong/tools/cache.lua",
+    ["kong.tools.database_cache"] = "kong/tools/database_cache.lua",
     ["kong.tools.timestamp"] = "kong/tools/timestamp.lua",
     ["kong.tools.printable"] = "kong/tools/printable.lua",
     ["kong.tools.http_client"] = "kong/tools/http_client.lua",

kong.yml

@@ -26,15 +26,14 @@ databases_available:
       keyspace: kong
       keepalive: 60000
 
+# Cassandra cache configuration
+database_cache_expiration: 5 # in seconds
+
 # Sends anonymous error reports
 send_anonymous_reports: true
 
 nginx_plus_status: false
 
-# Cassandra cache configuration
-cache:
-  expiration: 5 # in seconds
-
 # Nginx configuration
 nginx: |
   worker_processes auto;

kong/kong.lua

@@ -26,7 +26,7 @@
 
 utils = require "kong.tools.utils"
 local IO = require "kong.tools.io"
-local cache = require "kong.tools.cache"
+local cache = require "kong.tools.database_cache"
 local constants = require "kong.constants"
 local timestamp = require "kong.tools.timestamp"
 local stringy = require "stringy"

kong/plugins/basicauth/access.lua

@@ -1,6 +1,6 @@
 local constants = require "kong.constants"
 local stringy = require "stringy"
-local cache = require "kong.tools.cache"
+local cache = require "kong.tools.database_cache"
 
 local _M = {}
 

kong/plugins/keyauth/access.lua

@@ -1,7 +1,7 @@
 local constants = require "kong.constants"
 local Multipart = require "multipart"
 local stringy = require "stringy"
-local cache = require "kong.tools.cache"
+local cache = require "kong.tools.database_cache"
 
 local CONTENT_TYPE = "content-type"
 local CONTENT_LENGTH = "content-length"

kong/resolver/access.lua

@@ -1,6 +1,6 @@
 local stringy = require "stringy"
 local url = require("socket.url")
-local cache = require "kong.tools.cache"
+local cache = require "kong.tools.database_cache"
 
 local _M = {}
 

kong/tools/cache.lua → kong/tools/database_cache.lua

@@ -5,7 +5,7 @@ local _M = {}
 
 function _M.set(key, value, exptime)
   if exptime == nil then
-    exptime = configuration and configuration.cache.expiration or 0
+    exptime = configuration and configuration.database_cache_expiration or 0
   end
 
   local cache = ngx.shared.cache
@@ -70,4 +70,4 @@ function _M.get_and_set(key, cb)
   return val
 end
 
-return _M
+return _M

kong/tools/io.lua

@@ -88,6 +88,9 @@ function _M.load_configuration_and_dao(configuration_path)
   -- Adding computed properties to the configuration
   configuration.pid_file = path:join(configuration.nginx_working_dir, constants.CLI.NGINX_PID)
 
+  -- Alias the DAO configuration we are using for this instance for easy access
+  configuration.dao_config = dao_config
+
   -- Instanciate the DAO Factory along with the configuration
   local DaoFactory = require("kong.dao."..configuration.database..".factory")
   local dao_factory = DaoFactory(dao_config.properties)

spec/integration/proxy/cache_spec.lua → spec/integration/proxy/database_cache_spec.lua

@@ -8,7 +8,7 @@ local created_ids = {}
 local kWebURL = spec_helper.API_URL
 local kProxyURL = spec_helper.PROXY_URL
 
-describe("Cache #proxy", function()
+describe("Database cache", function()
 
   setup(function()
     spec_helper.prepare_db()

spec/unit/cache_spec.lua → spec/unit/database_cache_spec.lua

@@ -1,6 +1,6 @@
-local cache = require "kong.tools.cache"
+local cache = require "kong.tools.database_cache"
 
-describe("Cache", function()
+describe("Database cache", function()
 
   it("should return a valid API cache key", function()
     assert.are.equal("apis/httpbin.org", cache.api_key("httpbin.org"))
@@ -19,4 +19,4 @@ describe("Cache", function()
     assert.are.equal("basicauth_credentials/username", cache.basicauth_credential_key("username"))
   end)
 
-end)
+end)

spec/unit/statics_spec.lua

@@ -63,15 +63,14 @@ databases_available:
       keyspace: kong
       keepalive: 60000
 
+# Cassandra cache configuration
+database_cache_expiration: 5 # in seconds
+
 # Sends anonymous error reports
 send_anonymous_reports: true
 
 nginx_plus_status: false
 
-# Cassandra cache configuration
-cache:
-  expiration: 5 # in seconds
-
 # Nginx configuration
 nginx: |
   worker_processes auto;