Merge branch 'hotfix/resolve-hosts'

bin/busted

@@ -1,5 +1,13 @@
 #!/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"}) do
+  local socket = require(namespace .. ".socket")
+  socket.force_luasocket(ngx.get_phase(), true)
+end
+
 package.path = "?/init.lua;"..package.path
 
 if ngx ~= nil then

bin/kong

@@ -1,3 +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"}) do
+  local socket = require(namespace .. ".socket")
+  socket.force_luasocket(ngx.get_phase(), true)
+end
+
 require("kong.cmd.init")(arg)

kong-0.9.0-0.rockspec

@@ -20,8 +20,8 @@ dependencies = {
   "multipart == 0.3",
   "version == 0.2",
   "lapis == 1.5.1",
-  "lua-cassandra == 0.5.2",
-  "pgmoon == 1.6.0",
+  "lua-cassandra == 0.5.3",
+  "pgmoon-mashape == 1.7.0",
   "luatz == 0.3",
   "lua_system_constants == 0.1.1",
   "lua-resty-iputils == 0.2.1",

kong/dao/factory.lua

@@ -219,7 +219,7 @@ end
 
 local function default_on_migrate(identifier, db_infos)
   local log = require "kong.cmd.utils.log"
-  log("Migrating %s for %s %s",
+  log("migrating %s for %s %s",
       identifier, db_infos.desc, db_infos.name)
 end
 
@@ -235,6 +235,8 @@ function Factory:run_migrations(on_migrate, on_success)
 
   local log = require "kong.cmd.utils.log"
 
+  log.verbose("running datastore migrations")
+
   local migrations_modules = self:migrations_modules()
   local cur_migrations, err = self:current_migrations()
   if err then return nil, tostring(err) end
@@ -254,9 +256,11 @@ function Factory:run_migrations(on_migrate, on_success)
   end
 
   if migrations_ran > 0 then
-    log("Migrations up to date")
+    log("%d migrations ran", migrations_ran)
   end
 
+  log.verbose("migrations up to date")
+
   return true
 end