fix lint

Signed-off-by: dongjiang1989 <[email protected]>

Author: dongjiang1989

apisix/discovery/zookeeper/init.lua

@@ -20,8 +20,7 @@ local utils = require("apisix.discovery.zookeeper.utils")
 local schema = require("apisix.discovery.zookeeper.schema")
 local ngx = ngx
 local ipairs = ipairs
-local pairs = pairs
-local tostring = tostring
+local log = core.log
 
 local _M = {
     version = 0.1,
@@ -62,10 +61,10 @@ local function fetch_service_instances(conf, service_name)
     if not children then
         utils.close_zk_client(client)
         if err == "not exists" then
-            core.log.warn("service path not exists: ", service_path)
+            log.warn("service path not exists: ", service_path)
             return {}
         end
-        core.log.error("get zk children failed: ", err)
+        log.error("get zk children failed: ", err)
         return nil, err
     end
 
@@ -75,7 +74,7 @@ local function fetch_service_instances(conf, service_name)
         local instance_path = service_path .. "/" .. child
         local data, stat, err = client:get(instance_path)
         if not data then
-            core.log.error("get instance data failed: ", instance_path, " err: ", err)
+            log.error("get instance data failed: ", instance_path, " stat:", stat, " err: ", err)
             goto continue
         end
 
@@ -91,29 +90,29 @@ local function fetch_service_instances(conf, service_name)
     -- 5. Close connects
     utils.close_zk_client(client)
 
-    core.log.debug("fetch service instances: ", service_name, " count: ", #instances)
+    log.debug("fetch service instances: ", service_name, " count: ", #instances)
     return instances
 end
 
 -- Scheduled fetch of all service instances (full cache update)）
 local function fetch_all_services()
     if not local_conf then
-        core.log.warn("zookeeper discovery config not loaded")
+        log.warn("zookeeper discovery config not loaded")
         return
     end
 
-    -- 1. Init ZK client
+    -- 1. Init Zookeeper client
     local client, err = utils.new_zk_client(local_conf)
     if not client then
-        core.log.error("init zk client failed: ", err)
+        log.error("init zk client failed: ", err)
         return
     end
 
     -- 2.  All instance nodes under a service
     local services, err = client:get_children(local_conf.root_path)
     if not services then
         utils.close_zk_client(client)
-        core.log.error("get zk root children failed: ", err)
+        log.error("get zk root children failed: ", err)
         return
     end
 
@@ -127,7 +126,7 @@ local function fetch_all_services()
                 expire_time = now + local_conf.cache_ttl
             })
         else
-            core.log.error("fetch service instances failed: ", service, " err: ", err)
+            log.error("fetch service instances failed: ", service, " err: ", err)
         end
     end
 
@@ -137,7 +136,7 @@ end
 
 function _M.nodes(service_name)
     if not service_name or service_name == "" then
-        core.log.error("service name is empty")
+        log.error("service name is empty")
         return nil
     end
 
@@ -147,10 +146,10 @@ function _M.nodes(service_name)
 
     -- 2. If the cache is missed or expired, actively pull (the data)）
     if not cache or cache.expire_time < now then
-        core.log.debug("cache miss or expired, fetch from zk: ", service_name)
+        log.debug("cache miss or expired, fetch from zk: ", service_name)
         local instances, err = fetch_service_instances(local_conf, service_name)
         if not instances then
-            core.log.error("fetch instances failed: ", service_name, " err: ", err)
+            log.error("fetch instances failed: ", service_name, " err: ", err)
             -- Fallback: Return the old cache (if available)）
             if cache then
                 return cache.nodes
@@ -175,10 +174,11 @@ end
 
 function _M.init_worker()
     -- Load configuration
-    local_conf = core.config.local_conf.discovery and core.config.local_conf.discovery.zookeeper or {}
+    local core_config = core.config.local_conf
+    local_conf = core_config.discovery and core_config.discovery.zookeeper or {}
     local ok, err = schema.check(local_conf)
     if not ok then
-        core.log.error("invalid zookeeper discovery config: ", err)
+        log.error("invalid zookeeper discovery config: ", err)
         return
     end
 
@@ -190,7 +190,7 @@ function _M.init_worker()
     -- Start the timer
     if not fetch_timer then
         fetch_timer = ngx.timer.every(local_conf.fetch_interval, fetch_all_services)
-        core.log.info("zookeeper discovery fetch timer started, interval: ", local_conf.fetch_interval, "s")
+        log.info("zk discovery fetch timer started, interval: ", local_conf.fetch_interval, "s")
     end
 
     -- Manually execute a full pull immediately
@@ -199,11 +199,10 @@ end
 
 function _M.destroy()
     if fetch_timer then
-        ngx.timer.cancel(fetch_timer)
         fetch_timer = nil
     end
     instance_cache:flush_all()
-    core.log.info("zookeeper discovery destroyed")
+    log.info("zookeeper discovery destroyed")
 end
 
 return _M

apisix/discovery/zookeeper/utils.lua

@@ -18,7 +18,6 @@
 local core = require("apisix.core")
 local zk = require("resty.zookeeper")
 local cjson = require("cjson.safe")
-local string = string
 local ipairs = ipairs
 
 local _M = {}
@@ -51,7 +50,7 @@ end
 
 -- Recursively Create ZooKeeper Nodes
 function _M.create_zk_path(client, path)
-    local parts = string.split(path, "/")
+    local parts = core.utils.split(path, "/")
     local current = ""
     for _, part in ipairs(parts) do
         if part ~= "" then