diff --git a/.travis.yml b/.travis.yml index 2c57795dea67..63e040a21146 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,9 @@ env: global: - SERF=0.7.0 - LUAROCKS=2.4.0 - - OPENSSL=1.0.2h + - OPENSSL=1.0.2j - CASSANDRA=2.2.7 - - OPENRESTY=1.9.15.1 + - OPENRESTY=1.11.2.1 - DOWNLOAD_CACHE=$HOME/download-cache - INSTALL_CACHE=$HOME/install-cache matrix: diff --git a/kong/dao/postgres_db.lua b/kong/dao/postgres_db.lua index ec4642d1252d..41b67d67de5e 100644 --- a/kong/dao/postgres_db.lua +++ b/kong/dao/postgres_db.lua @@ -281,6 +281,8 @@ end -- Delete old expired TTL entities function PostgresDB:clear_expired_ttl() + ngx.log(ngx.DEBUG, "clearing expired TTLs") + local query = "SELECT * FROM ttls WHERE expire_at < CURRENT_TIMESTAMP(0) at time zone 'utc'" local res, err = self:query(query) if err then diff --git a/kong/meta.lua b/kong/meta.lua index 56128d0db502..c0f439aecab9 100644 --- a/kong/meta.lua +++ b/kong/meta.lua @@ -18,7 +18,7 @@ return { -- third-party dependencies' required version, as they would be specified -- to lua-version's `set()` in the form {from, to} _DEPENDENCIES = { - nginx = {"1.9.15.1", "1.11.2.1"}, + nginx = {"1.11.2.1"}, serf = {"0.7.0", "0.8.0"}, --resty = {}, -- not version dependent for now --dnsmasq = {} -- not version dependent for now