Skip to content

Commit

Permalink
chore(*) move various components out of core/ directory
Browse files Browse the repository at this point in the history
None of those components relate to the internal runloop of Kong.
Subsequent commits will rename `core/` to `runloop/`.
  • Loading branch information
thibaultcha committed Apr 26, 2018
1 parent 4973a62 commit 82a51c4
Show file tree
Hide file tree
Showing 19 changed files with 30 additions and 31 deletions.
2 changes: 1 addition & 1 deletion bin/busted
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ end

require "luarocks.loader"

require("kong.core.globalpatches")({
require("kong.globalpatches")({
cli = true,
rbusted = true
})
Expand Down
13 changes: 6 additions & 7 deletions kong-0.13.1-0.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,20 @@ build = {
modules = {
["kong"] = "kong/init.lua",
["kong.meta"] = "kong/meta.lua",
["kong.cache"] = "kong/cache.lua",
["kong.router"] = "kong/router.lua",
["kong.api_router"] = "kong/api_router.lua",
["kong.reports"] = "kong/reports.lua",
["kong.constants"] = "kong/constants.lua",
["kong.singletons"] = "kong/singletons.lua",
["kong.conf_loader"] = "kong/conf_loader.lua",
["kong.globalpatches"] = "kong/globalpatches.lua",
["kong.error_handlers"] = "kong/error_handlers.lua",

["kong.cluster_events"] = "kong/cluster_events.lua",
["kong.cluster_events.strategies.cassandra"] = "kong/cluster_events/strategies/cassandra.lua",
["kong.cluster_events.strategies.postgres"] = "kong/cluster_events/strategies/postgres.lua",

["kong.cache"] = "kong/cache.lua",

["kong.templates.nginx"] = "kong/templates/nginx.lua",
["kong.templates.nginx_kong"] = "kong/templates/nginx_kong.lua",
["kong.templates.kong_defaults"] = "kong/templates/kong_defaults.lua",
Expand Down Expand Up @@ -98,12 +102,7 @@ build = {

["kong.core.handler"] = "kong/core/handler.lua",
["kong.core.certificate"] = "kong/core/certificate.lua",
["kong.core.router"] = "kong/core/router.lua",
["kong.core.api_router"] = "kong/core/api_router.lua",
["kong.core.plugins_iterator"] = "kong/core/plugins_iterator.lua",
["kong.core.reports"] = "kong/core/reports.lua",
["kong.core.error_handlers"] = "kong/core/error_handlers.lua",
["kong.core.globalpatches"] = "kong/core/globalpatches.lua",
["kong.core.balancer"] = "kong/core/balancer.lua",

["kong.dao.errors"] = "kong/dao/errors.lua",
Expand Down
2 changes: 1 addition & 1 deletion kong/api/routes/apis.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local crud = require "kong.api.crud_helpers"
local utils = require "kong.tools.utils"
local reports = require "kong.core.reports"
local reports = require "kong.reports"

return {
["/apis/"] = {
Expand Down
2 changes: 1 addition & 1 deletion kong/api/routes/plugins.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local crud = require "kong.api.crud_helpers"
local cjson = require "cjson"
local utils = require "kong.tools.utils"
local reports = require "kong.core.reports"
local reports = require "kong.reports"
local singletons = require "kong.singletons"

-- Remove functions from a schema definition so that
Expand Down
2 changes: 1 addition & 1 deletion kong/api/routes/routes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local api_helpers = require "kong.api.api_helpers"
local singletons = require "kong.singletons"
local responses = require "kong.tools.responses"
local endpoints = require "kong.api.endpoints"
local reports = require "kong.core.reports"
local reports = require "kong.reports"
local utils = require "kong.tools.utils"
local crud = require "kong.api.crud_helpers"

Expand Down
2 changes: 1 addition & 1 deletion kong/api/routes/services.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local api_helpers = require "kong.api.api_helpers"
local singletons = require "kong.singletons"
local responses = require "kong.tools.responses"
local endpoints = require "kong.api.endpoints"
local reports = require "kong.core.reports"
local reports = require "kong.reports"
local utils = require "kong.tools.utils"
local crud = require "kong.api.crud_helpers"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion kong/cmd/init.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require("kong.core.globalpatches")({cli = true})
require("kong.globalpatches")({cli = true})

math.randomseed() -- Generate PRNG seed

Expand Down
6 changes: 3 additions & 3 deletions kong/core/handler.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
-- In the `access_by_lua` phase, it is responsible for retrieving the route being proxied by
-- a consumer. Then it is responsible for loading the plugins to execute on this request.
local utils = require "kong.tools.utils"
local Router = require "kong.core.router"
local ApiRouter = require "kong.core.api_router"
local reports = require "kong.core.reports"
local Router = require "kong.router"
local ApiRouter = require "kong.api_router"
local reports = require "kong.reports"
local balancer = require "kong.core.balancer"
local constants = require "kong.constants"
local responses = require "kong.tools.responses"
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions kong/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ do
end
end

require("kong.core.globalpatches")()
require("kong.globalpatches")()

local ip = require "kong.tools.ip"
local DB = require "kong.db"
Expand All @@ -58,7 +58,7 @@ local ngx_balancer = require "ngx.balancer"
local plugins_iterator = require "kong.core.plugins_iterator"
local balancer_execute = require("kong.core.balancer").execute
local kong_cluster_events = require "kong.cluster_events"
local kong_error_handlers = require "kong.core.error_handlers"
local kong_error_handlers = require "kong.error_handlers"

local ngx = ngx
local header = ngx.header
Expand Down Expand Up @@ -128,7 +128,7 @@ local function load_plugins(kong_conf, dao)

-- add reports plugin if not disabled
if kong_conf.anonymous_reports then
local reports = require "kong.core.reports"
local reports = require "kong.reports"

local db_infos = dao:infos()
reports.add_ping_value("database", kong_conf.database)
Expand Down Expand Up @@ -184,7 +184,7 @@ function Kong.init()
end

function Kong.init_worker()
-- special math.randomseed from kong.core.globalpatches
-- special math.randomseed from kong.globalpatches
-- not taking any argument. Must be called only once
-- and in the init_worker phase, to avoid duplicated
-- seeds.
Expand Down
2 changes: 1 addition & 1 deletion kong/plugins/rate-limiting/policies/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local singletons = require "kong.singletons"
local timestamp = require "kong.tools.timestamp"
local redis = require "resty.redis"
local policy_cluster = require "kong.plugins.rate-limiting.policies.cluster"
local reports = require "kong.core.reports"
local reports = require "kong.reports"


local ngx_log = ngx.log
Expand Down
2 changes: 1 addition & 1 deletion kong/plugins/response-ratelimiting/policies/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local singletons = require "kong.singletons"
local timestamp = require "kong.tools.timestamp"
local redis = require "resty.redis"
local policy_cluster = require "kong.plugins.response-ratelimiting.policies.cluster"
local reports = require "kong.core.reports"
local reports = require "kong.reports"


local ngx_log = ngx.log
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions spec-old-api/01-unit/010-router_spec.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
local Router = require "kong.core.api_router"
local Router = require "kong.api_router"

local function reload_router()
package.loaded["kong.core.api_router"] = nil
Router = require "kong.core.api_router"
package.loaded["kong.api_router"] = nil
Router = require "kong.api_router"
end

local use_case = {
Expand Down
6 changes: 3 additions & 3 deletions spec/01-unit/010-router_spec.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
local Router = require "kong.core.router"
local Router = require "kong.router"

local function reload_router()
package.loaded["kong.core.router"] = nil
Router = require "kong.core.router"
package.loaded["kong.router"] = nil
Router = require "kong.router"
end

local service = {
Expand Down
6 changes: 3 additions & 3 deletions spec/01-unit/013-reports_spec.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local meta = require "kong.meta"
local helpers = require "spec.helpers"
local reports = require "kong.core.reports"
local reports = require "kong.reports"
local cjson = require "cjson"


Expand Down Expand Up @@ -79,8 +79,8 @@ describe("reports", function()
end)

before_each(function()
package.loaded["kong.core.reports"] = nil
reports = require "kong.core.reports"
package.loaded["kong.reports"] = nil
reports = require "kong.reports"
reports.toggle(true)
end)

Expand Down

0 comments on commit 82a51c4

Please sign in to comment.