Merge pull request #1647 from Mashape/fix/dns2-cli-tcp-override

Fix/dns2 cli tcp override

.ci/run_tests.sh

@@ -1,7 +1,7 @@
 set -e
 
 export BUSTED_ARGS="-o gtest -v --exclude-tags=ci"
-export TEST_CMD="KONG_SERF_PATH=$SERF_INSTALL/serf bin/busted $BUSTED_ARGS"
+export TEST_CMD="KONG_SERF_PATH=$SERF_PATH bin/busted $BUSTED_ARGS"
 
 if [ "$TEST_SUITE" == "lint" ]; then
   make lint

.ci/setup_env.sh

@@ -1,31 +1,61 @@
 set -e
 
-export OPENRESTY_INSTALL=$CACHE_DIR/openresty
-export LUAROCKS_INSTALL=$CACHE_DIR/luarocks
-export SERF_INSTALL=$CACHE_DIR/serf
+#---------
+# Download
+#---------
+OPENSSL_DOWNLOAD=$DOWNLOAD_CACHE/openssl-$OPENSSL
+OPENRESTY_DOWNLOAD=$DOWNLOAD_CACHE/openresty-$OPENRESTY
+LUAROCKS_DOWNLOAD=$DOWNLOAD_CACHE/luarocks-$LUAROCKS
+SERF_DOWNLOAD=$DOWNLOAD_CACHE/serf-$SERF
 
-mkdir -p $CACHE_DIR
+mkdir -p $OPENSSL_DOWNLOAD $OPENRESTY_DOWNLOAD $LUAROCKS_DOWNLOAD $SERF_DOWNLOAD
 
-if [ ! "$(ls -A $CACHE_DIR)" ]; then
-  # Not in cache
+if [ ! "$(ls -A $OPENSSL_DOWNLOAD)" ]; then
+  pushd $DOWNLOAD_CACHE
+    curl -L http://www.openssl.org/source/openssl-$OPENSSL.tar.gz | tar xz
+  popd
+fi
+
+if [ ! "$(ls -A $OPENRESTY_DOWNLOAD)" ]; then
+  pushd $DOWNLOAD_CACHE
+    curl -L https://openresty.org/download/openresty-$OPENRESTY.tar.gz | tar xz
+  popd
+fi
+
+if [ ! "$(ls -A $LUAROCKS_DOWNLOAD)" ]; then
+  git clone https://github.com/keplerproject/luarocks.git $LUAROCKS_DOWNLOAD
+fi
+
+if [ ! "$(ls -A $SERF_DOWNLOAD)" ]; then
+  pushd $SERF_DOWNLOAD
+    wget https://releases.hashicorp.com/serf/${SERF}/serf_${SERF}_linux_amd64.zip
+    unzip serf_${SERF}_linux_amd64.zip
+  popd
+fi
+
+#--------
+# Install
+#--------
+OPENSSL_INSTALL=$INSTALL_CACHE/openssl-$OPENSSL
+OPENRESTY_INSTALL=$INSTALL_CACHE/openresty-$OPENRESTY
+LUAROCKS_INSTALL=$INSTALL_CACHE/luarocks-$LUAROCKS
+SERF_INSTALL=$INSTALL_CACHE/serf-$SERF
 
-  # ---------------
-  # Install OpenSSL
-  # ---------------
-  OPENSSL_BASE=openssl-$OPENSSL
-  curl -L http://www.openssl.org/source/$OPENSSL_BASE.tar.gz | tar xz
+mkdir -p $OPENSSL_INSTALL $OPENRESTY_INSTALL $LUAROCKS_INSTALL $SERF_INSTALL
 
-  # -----------------
-  # Install OpenResty
-  # -----------------
-  OPENRESTY_BASE=openresty-$OPENRESTY
-  mkdir -p $OPENRESTY_INSTALL
-  curl -L https://openresty.org/download/$OPENRESTY_BASE.tar.gz | tar xz
+if [ ! "$(ls -A $OPENSSL_INSTALL)" ]; then
+  pushd $OPENSSL_DOWNLOAD
+    ./config shared --prefix=$OPENSSL_INSTALL
+    make
+    make install
+  popd
+fi
 
-  pushd $OPENRESTY_BASE
+if [ ! "$(ls -A $OPENRESTY_INSTALL)" ]; then
+  pushd $OPENRESTY_DOWNLOAD
     ./configure \
       --prefix=$OPENRESTY_INSTALL \
-      --with-openssl=../$OPENSSL_BASE \
+      --with-openssl=$OPENSSL_DOWNLOAD \
       --with-ipv6 \
       --with-pcre-jit \
       --with-http_ssl_module \
@@ -34,17 +64,10 @@ if [ ! "$(ls -A $CACHE_DIR)" ]; then
     make
     make install
   popd
+fi
 
-  rm -rf $OPENRESTY_BASE
-
-  # ----------------
-  # Install Luarocks
-  # ----------------
-  LUAROCKS_BASE=luarocks-$LUAROCKS
-  mkdir -p $LUAROCKS_INSTALL
-  git clone https://github.com/keplerproject/luarocks.git $LUAROCKS_BASE
-
-  pushd $LUAROCKS_BASE
+if [ ! "$(ls -A $LUAROCKS_INSTALL)" ]; then
+  pushd $LUAROCKS_DOWNLOAD
     git checkout v$LUAROCKS
     ./configure \
       --prefix=$LUAROCKS_INSTALL \
@@ -54,19 +77,15 @@ if [ ! "$(ls -A $CACHE_DIR)" ]; then
     make build
     make install
   popd
+fi
 
-  rm -rf $LUAROCKS_BASE
-
-  # ------------
-  # Install Serf
-  # ------------
-  mkdir -p $SERF_INSTALL
-  pushd $SERF_INSTALL
-    wget https://releases.hashicorp.com/serf/${SERF}/serf_${SERF}_linux_amd64.zip
-    unzip serf_${SERF}_linux_amd64.zip
-  popd
+if [ ! "$(ls -A $SERF_INSTALL)" ]; then
+  ln -s $SERF_DOWNLOAD/serf $SERF_INSTALL/serf
 fi
 
+export OPENSSL_DIR=$OPENSSL_INSTALL # for LuaSec install
+export SERF_PATH=$SERF_INSTALL/serf # for our test instance (not in default bin/sh $PATH)
+
 export PATH=$PATH:$OPENRESTY_INSTALL/nginx/sbin:$OPENRESTY_INSTALL/bin:$LUAROCKS_INSTALL/bin:$SERF_INSTALL
 
 eval `luarocks path`

.travis.yml

@@ -1,5 +1,10 @@
 sudo: false
 
+language: c
+
+compiler:
+  - gcc
+
 notifications:
   email: false
 
@@ -15,11 +20,12 @@ addons:
 env:
   global:
     - SERF=0.7.0
-    - LUAROCKS=2.3.0
+    - LUAROCKS=2.4.0
     - OPENSSL=1.0.2h
     - CASSANDRA=2.2.7
     - OPENRESTY=1.9.15.1
-    - $CACHE_DIR=$HOME/cache
+    - DOWNLOAD_CACHE=$HOME/download-cache
+    - INSTALL_CACHE=$HOME/install-cache
   matrix:
     - TEST_SUITE=lint
     - TEST_SUITE=unit
@@ -39,5 +45,6 @@ cache:
   apt: true
   pip: true
   directories:
-    - $CACHE_DIR
+    - $DOWNLOAD_CACHE
+    - $INSTALL_CACHE
     - $HOME/.ccm/repository

README.md

@@ -262,7 +262,7 @@ usage of the tests suites and the Makefile.
 
 Finally, a very useful tool in Lua development (as with many other dynamic
 languages) is performing static linting of your code. You can use [luacheck]
-(installed with `make dev`) for this:
+\(installed with `make dev`\) for this:
 
 ```
 $ make lint

bin/busted

@@ -1,17 +1,11 @@
-#!/usr/bin/env resty
-
--- force LuaSocket usage to resolve `/etc/hosts` until
--- supported by resty-cli.
--- See https://github.com/Mashape/kong/issues/1523
-for _, namespace in ipairs({"cassandra", "pgmoon-mashape"}) do
-  local socket = require(namespace .. ".socket")
-  socket.force_luasocket(ngx.get_phase(), true)
-end
+#!/usr/bin/env resty -c 65535
 
 package.path = "?/init.lua;"..package.path
 
+require "kong.core.globalpatches"
+
 if ngx ~= nil then
-  ngx.exit = function()end
+  ngx.exit = function() end
 end
 
 -- Busted command-line runner

bin/kong

@@ -1,11 +1,7 @@
 #!/usr/bin/env resty
 
--- force LuaSocket usage to resolve `/etc/hosts` until
--- supported by resty-cli.
--- See https://github.com/Mashape/kong/issues/1523
-for _, namespace in ipairs({"cassandra", "pgmoon-mashape"}) do
-  local socket = require(namespace .. ".socket")
-  socket.force_luasocket(ngx.get_phase(), true)
-end
+-- require global patches, to enable dns resolution by the internal client
+-- initializing the dns client is done in `./kong/conf_loader.lua` 
+require "kong.core.globalpatches"
 
 require("kong.cmd.init")(arg)

kong-0.9.1-0.rockspec

@@ -21,14 +21,14 @@ dependencies = {
   "version == 0.2",
   "lapis == 1.5.1",
   "lua-cassandra == 0.5.3",
-  "pgmoon-mashape == 2.0.0",
+  "pgmoon == 1.6.0",
   "luatz == 0.3",
   "lua_system_constants == 0.1.1",
   "lua-resty-iputils == 0.2.1",
   "luacrypto == 0.3.2",
   "luasyslog == 1.0.0",
   "lua_pack == 1.0.4",
-  "dns == 0.1",
+  "dns == 0.1.0",
 }
 build = {
   type = "builtin",

kong/cmd/start.lua

@@ -13,20 +13,20 @@ local function execute(args)
   local dao = DAOFactory(conf)
   local err
   xpcall(function()
-    assert(dao:run_migrations())
     assert(prefix_handler.prepare_prefix(conf, args.nginx_conf))
+    assert(dao:run_migrations())
     assert(serf_signals.start(conf, dao))
     assert(nginx_signals.start(conf))
     log("Kong started")
   end, function(e)
-    log.verbose("could not start Kong, stopping services")
-    nginx_signals.stop(conf)
-    serf_signals.stop(conf, dao)
     err = e -- cannot throw from this function
-    log.verbose("stopped services")
   end)
 
   if err then
+    log.verbose("could not start Kong, stopping services")
+    pcall(nginx_signals.stop(conf))
+    pcall(serf_signals.stop(conf, dao))
+    log.verbose("stopped services")
     error(err) -- report to main error handler
   end
 end

kong/conf_loader.lua

@@ -372,6 +372,10 @@ local function load(path, custom_conf)
 
   log.verbose("prefix in use: %s", conf.prefix)
 
+  -- initialize the dns client, so the globally patched tcp.connect method
+  -- will work from here onwards.
+  assert(require("kong.tools.dns")(conf))
+
   return setmetatable(conf, nil) -- remove Map mt
 end