svc clean

Kong · Oct 27, 2023 · e7e20df · e7e20df
1 parent dff4dbb
commit e7e20df
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/kong/clustering/control_plane/rpc.lua b/kong/clustering/control_plane/rpc.lua
@@ -20,11 +20,10 @@ function _M.new(clustering)
 
     -- last push config
     locks = assert(lrucache.new(4)),
-  }
 
-  -- init rpc services
-  self.ping_svc = ping_svc.new()
-  self.ping_svc:init()
+    -- rpc services
+    ping_svc = ping_svc.new()
+  }
 
   -- init rpc cp side
   local cp = rpc_cp.new({ "kong.test.v1", })
@@ -74,7 +73,10 @@ function _M:init_worker(basic_info)
   self.filters = basic_info.filters
   --]]
 
-  -- invoke rpc call
+  -- init rpc services
+  self.ping_svc:init_worker()
+
+  -- event to invoke rpc call
   events.clustering_push_config(function()
     local key = "last_push_config"
     local delay = self.conf.db_update_frequency

diff --git a/kong/clustering/control_plane/services/ping.lua b/kong/clustering/control_plane/services/ping.lua
@@ -12,7 +12,7 @@ function _M.new()
 end
 
 
-function _M:init()
+function _M:init_worker()
   callbacks.register("kong.test.v1.ping", function(params)
     ngx.log(ngx.ERR, "xxx ping received: ", params.msg)
     return { msg = "pong for " .. params.msg }

diff --git a/kong/clustering/data_plane/rpc.lua b/kong/clustering/data_plane/rpc.lua
@@ -26,11 +26,11 @@ function _M.new(clustering)
     conf = conf,
     cert = clustering.cert,
     cert_key = clustering.cert_key,
+
+    -- rpc services
+    sync_svc = sync_svc.new(),
   }
 
-  -- init rpc services
-  self.sync_svc = sync_svc.new()
-  self.sync_svc:init()
 
   local address = conf.cluster_control_plane .. "/v2/outlet"
   local uri = "wss://" .. address .. "?node_id=" ..
@@ -77,6 +77,10 @@ function _M:init_worker(basic_info)
   self.plugins_list = basic_info.plugins
   self.filters = basic_info.filters
 
+  -- init rpc services
+  self.sync_svc:init_worker()
+
+  -- init rpc connection
   kong.rpc:init_worker()
 
   ping_cp_test()

diff --git a/kong/clustering/data_plane/services/sync.lua b/kong/clustering/data_plane/services/sync.lua
@@ -22,7 +22,7 @@ function _M.new()
 end
 
 
-function _M:init()
+function _M:init_worker()
   callbacks.register("kong.sync.v1.push_all", function(params)
     ngx.log(ngx.ERR, "xxx sync push all, data type=", type(params.data))