Merge pull request #1151 from Mashape/hotfix/0.8/cassandra-default-port

fix(cassandra) add a 'port' option for clusters

CHANGELOG.md

@@ -20,6 +20,7 @@ This release includes support for PostgreSQL as Kong's primary datastore!
 
 ### Fixed
 
+- Introduce a new `port` option when connecting to your Cassandra cluster instead of using the CQL default (9042). [#1139](https://github.com/Mashape/kong/issues/1139)
 - Plugins
   - Request/Response Transformer: add missing migrations for upgrades from ` <= 0.5.x`. [#1064](https://github.com/Mashape/kong/issues/1064)
   - OAuth2

kong-0.8.0rc2-0.rockspec

@@ -20,7 +20,7 @@ dependencies = {
   "yaml ~> 1.1.2-1",
   "lapis ~> 1.3.1-1",
   "stringy ~> 0.4-1",
-  "lua-cassandra ~> 0.5.0",
+  "lua-cassandra ~> 0.5.1",
   "pgmoon ~> 1.4.0",
   "multipart ~> 0.3-2",
   "lua-path ~> 0.2.3-1",
@@ -264,7 +264,7 @@ build = {
     ["kong.plugins.datadog.handler"] = "kong/plugins/datadog/handler.lua",
     ["kong.plugins.datadog.schema"] = "kong/plugins/datadog/schema.lua",
     ["kong.plugins.datadog.statsd_logger"] = "kong/plugins/datadog/statsd_logger.lua",
-    
+
     ["kong.plugins.statsd.handler"] = "kong/plugins/statsd/handler.lua",
     ["kong.plugins.statsd.schema"] = "kong/plugins/statsd/schema.lua",
     ["kong.plugins.statsd.statsd_logger"] = "kong/plugins/statsd/statsd_logger.lua"

kong.yml

@@ -88,8 +88,8 @@
   # encrypt: "foo"
 
   ######
-  ## The TTL (time to live), in seconds, of a node in the cluster when it stops sending healthcheck pings, maybe 
-  ## because of a failure. If the node is not able to send a new healthcheck before the expiration, then new nodes 
+  ## The TTL (time to live), in seconds, of a node in the cluster when it stops sending healthcheck pings, maybe
+  ## because of a failure. If the node is not able to send a new healthcheck before the expiration, then new nodes
   ## in the cluster will stop attempting to connect to it on startup.
   # ttl_on_failure: 3600
 
@@ -120,6 +120,10 @@
   # contact_points:
   #   - "127.0.0.1:9042"
 
+  ## Port on which your cluster's peers (other than your contact_points)
+  ## are listening on.
+  # port: 9042
+
   ######
   ## Name of the keyspace used by Kong. Will be created if it does not exist.
   # keyspace: kong

kong/dao/cassandra_db.lua

@@ -26,6 +26,9 @@ function CassandraDB:new(options)
     prepared_shm = "cassandra_prepared",
     contact_points = options.contact_points,
     keyspace = options.keyspace,
+    protocol_options = {
+      default_port = options.port
+    },
     query_options = {
       prepare = true
     },

kong/tools/config_defaults.lua

@@ -49,14 +49,15 @@ return {
     type = "table",
     content = {
       ["contact_points"] = {type = "array", default = {"127.0.0.1:9042"}},
+      ["port"] = {type = "number", default = 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 = {}},
       ["username"] = {type = "string", nullable = true},
       ["password"] = {type = "string", nullable = true},
-      ["consistency"] = {type = "string", default = "ONE", enum = {"ANY", "ONE", "TWO", "THREE", "QUORUM", "ALL", "LOCAL_QUORUM", 
+      ["consistency"] = {type = "string", default = "ONE", enum = {"ANY", "ONE", "TWO", "THREE", "QUORUM", "ALL", "LOCAL_QUORUM",
                                                                    "EACH_QUORUM", "SERIAL", "LOCAL_SERIAL", "LOCAL_ONE"}},
       ["ssl"] = {
         type = "table",