refine due to PR comments

Kong · Aug 13, 2024 · dbd94d8 · dbd94d8
1 parent 51fab9e
commit dbd94d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/kong/init.lua b/kong/init.lua
@@ -643,6 +643,9 @@ function Kong.init()
   -- retrieve kong_config
   local conf_path = pl_path.join(ngx.config.prefix(), ".kong_env")
   local config = assert(conf_loader(conf_path, nil, { from_kong_env = true }))
+
+  -- The dns client has been initialized in conf_loader, so we set it directly.
+  -- Other modules should use 'kong.dns' to avoid reinitialization.
   kong.dns = assert(package.loaded["kong.resty.dns.client"])
 
   reset_kong_shm(config)

diff --git a/kong/runloop/balancer/targets.lua b/kong/runloop/balancer/targets.lua
@@ -49,7 +49,7 @@ local resolve_timer_running
 local queryDns
 
 function targets_M.init()
-  dns_client = assert(package.loaded["kong.resty.dns.client"])
+  dns_client = assert(kong.dns)
   if renewal_heap:size() > 0 then
     renewal_heap = require("binaryheap").minUnique()
     renewal_weak_cache = setmetatable({}, { __mode = "v" })    

diff --git a/kong/timing/hooks/dns.lua b/kong/timing/hooks/dns.lua
@@ -2,8 +2,6 @@ local _M = {}
 
 local timing
 
-local client = assert(package.loaded["kong.resty.dns.client"])
-
 local function before_toip(qname, _port, _dnsCacheOnly, _try_list)
   timing.enter_context("dns")
   timing.enter_context(qname)
@@ -26,6 +24,7 @@ function _M.register_hooks(timing_module)
     Here is the signature of the `toip()` function:
     function toip(self, qname, port, dnsCacheOnly, try_list)
   --]]
+  local client = assert(kong.dns)
   req_dyn_hook.hook_function("timing", client, "toip", 4, {
     befores = { before_toip },
     afters = { after_toip },