diff --git a/kong/init.lua b/kong/init.lua index 4c3d3ef9f4fc..e46867d92c02 100644 --- a/kong/init.lua +++ b/kong/init.lua @@ -652,17 +652,19 @@ function Kong.init() -- duplicated seeds. math.randomseed() - ngx.log(ngx.ERR, "kong.default_workspace: 1:", tostring(kong.default_workspace)) + -- ngx.log(ngx.ERR, "kong.default_workspace: 1:", tostring(kong.default_workspace)) kong_global.init_pdk(kong, config) instrumentation.init(config) wasm.init(config) - ngx.log(ngx.ERR, "kong.default_workspace: 1:", tostring(kong.default_workspace)) + -- ngx.log(ngx.ERR, "kong.default_workspace: 1:", tostring(kong.default_workspace)) local db = assert(DB.new(config)) + assert(db.workspaces) instrumentation.db_query(db.connector) assert(db:init_connector()) - ngx.log(ngx.ERR, "kong.default_workspace: 1:", tostring(kong.default_workspace)) + -- ngx.log(ngx.ERR, "kong.default_workspace: 1:", tostring(kong.default_workspace)) + assert(db.workspaces) -- check state of migration only if there is an external database if not is_dbless(config) then @@ -683,9 +685,9 @@ function Kong.init() end end end + assert(db.workspaces) assert(db:connect()) - ngx.log(ngx.ERR, "kong.default_workspace: 1:", tostring(kong.default_workspace)) kong.db = db @@ -693,8 +695,6 @@ function Kong.init() certificate.init() end - ngx.log(ngx.ERR, "kong.default_workspace: 1:", tostring(kong.default_workspace)) - if is_http_module and (is_data_plane(config) or is_control_plane(config)) then kong.clustering = require("kong.clustering").new(config) @@ -747,9 +747,9 @@ function Kong.init() else local default_ws = db.workspaces:select_by_name("default") - ngx.log(ngx.ERR, "kong.default_workspace: 1:", tostring(kong.default_workspace), " :", require("inspect")(default_ws)) +-- ngx.log(ngx.ERR, "kong.default_workspace: 1:", tostring(kong.default_workspace), " :", require("inspect")(default_ws)) kong.default_workspace = default_ws and default_ws.id - ngx.log(ngx.ERR, "kong.default_workspace: 2:", tostring(kong.default_workspace)) +-- ngx.log(ngx.ERR, "kong.default_workspace: 2:", tostring(kong.default_workspace)) local ok, err = runloop.build_plugins_iterator("init") if not ok then