feat(config) implement a C* timeout property

muharihar · Feb 3, 2016 · d9fbe01 · d9fbe01
1 parent b94439d
commit d9fbe01
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/kong.yml b/kong.yml
@@ -103,6 +103,10 @@
   ## Name of the keyspace used by Kong. Will be created if it does not exist.
   # keyspace: kong
 
+  #####
+  ## Connection and reading timeout (in ms).
+  # timeout: 5000
+
   ######
   ## Keyspace options. Set those before running Kong or any migration.
   ## Those settings will be used to create a keyspace with the desired options

diff --git a/kong/dao/cassandra/factory.lua b/kong/dao/cassandra/factory.lua
@@ -117,8 +117,10 @@ function CassandraFactory:get_session_options()
     query_options = {
       prepare = true
     },
-    username = self.properties.username,
-    password = self.properties.password,
+    socket_options = {
+      connect_timeout = self.properties.timeout,
+      read_timeout = self.properties.timeout
+    },
     ssl_options = {
       enabled = self.properties.ssl.enabled,
       verify = self.properties.ssl.verify,

diff --git a/kong/tools/config_defaults.lua b/kong/tools/config_defaults.lua
@@ -38,6 +38,7 @@ return {
     content = {
       ["contact_points"] = {type = "array", default = {"127.0.0.1:9042"}},
       ["keyspace"] = {type = "string", default = "kong"},
+      ["timeout"] = {type = "number", default = 5000},
       ["replication_strategy"] = {type = "string", default = "SimpleStrategy", enum = {"SimpleStrategy", "NetworkTopologyStrategy"}},
       ["replication_factor"] = {type = "number", default = 1},
       ["data_centers"] = {type = "table", default = {}},

diff --git a/spec/unit/dao/cassandra/factory_spec.lua b/spec/unit/dao/cassandra/factory_spec.lua
@@ -1,5 +1,6 @@
 local Factory = require "kong.dao.cassandra.factory"
 local utils = require "kong.tools.utils"
+local cassandra = require "cassandra"
 local spec_helpers = require "spec.spec_helpers"
 local env = spec_helpers.get_env()
 local default_dao_properties = env.configuration.cassandra
@@ -24,6 +25,10 @@ describe("Cassadra factory", function()
         query_options = {
           prepare = true
         },
+        socket_options = {
+          connect_timeout = 5000,
+          read_timeout = 5000
+        },
         ssl_options = {
           enabled = false,
           verify = false
@@ -46,6 +51,10 @@ describe("Cassadra factory", function()
         query_options = {
           prepare = true
         },
+        socket_options = {
+          connect_timeout = 5000,
+          read_timeout = 5000
+        },
         ssl_options = {
           enabled = false,
           verify = false
@@ -68,12 +77,15 @@ describe("Cassadra factory", function()
         query_options = {
           prepare = true
         },
+        socket_options = {
+          connect_timeout = 5000,
+          read_timeout = 5000
+        },
         ssl_options = {
           enabled = false,
           verify = false
         },
-        username = "cassie",
-        password = "cassiepwd"
+        auth = cassandra.auth.PlainTextProvider("cassie", "cassiepwd")
       }, options)
     end)
     it("should accept SSL properties", function()
@@ -93,6 +105,10 @@ describe("Cassadra factory", function()
         query_options = {
           prepare = true
         },
+        socket_options = {
+          connect_timeout = 5000,
+          read_timeout = 5000
+        },
         ssl_options = {
           enabled = false,
           verify = true
@@ -113,6 +129,10 @@ describe("Cassadra factory", function()
         query_options = {
           prepare = true
         },
+        socket_options = {
+          connect_timeout = 5000,
+          read_timeout = 5000
+        },
         ssl_options = {
           enabled = true,
           verify = true