feat: 支持sharedict数据界面操作管理

feat: 优化sharedict场景划分
feat: 移除代码部分无效引用
fix: 修复auth插件拦截异常执行问题

Author: iamtsm

api/router/tl_ops_api_get_shdict_key_state.lua

@@ -0,0 +1,63 @@
+-- tl_ops_api
+-- en : get share dict key state
+-- zn : 获取share dict key数据内容
+-- @author iamtsm
+-- @email 1905333456@qq.com
+
+local tl_ops_rt         = require("constant.tl_ops_constant_comm").tl_ops_rt;
+local tl_ops_utils_func = require("utils.tl_ops_utils_func");
+local balance_shared    = ngx.shared.tlopsbalance
+local plugin_shared     = ngx.shared.tlopsplugin
+local waf_shared        = ngx.shared.tlopswaf
+local cache_shared      = ngx.shared.tlopscache
+local cjson             = require("cjson.safe");
+cjson.encode_empty_table_as_object(false)
+
+
+local Router = function()
+
+    local res_data = {}
+
+    local args = ngx.req.get_uri_args()
+
+    local type = args.type
+    if not type then
+        tl_ops_utils_func:set_ngx_req_return_ok(tl_ops_rt.args_error, "type nil");
+        return
+    end
+
+    local key = args.key
+
+    if not key then
+        tl_ops_utils_func:set_ngx_req_return_ok(tl_ops_rt.args_error, "key nil");
+        return
+    end
+
+    if type and type == 'balance' then
+        res_data = {
+            value = balance_shared:get(key)
+        }
+    end
+
+    if type and type == 'waf' then
+        res_data = {
+            value = waf_shared:get(key);
+        }
+    end
+
+    if type and type == 'plugin' then
+        res_data = {
+            value = plugin_shared:get(key);
+        }
+    end
+
+    if type and type == 'cache' then
+        res_data = {
+            value = cache_shared:get(key);
+        }
+    end
+
+    tl_ops_utils_func:set_ngx_req_return_ok(tl_ops_rt.ok, "success", res_data);
+end
+
+return Router

api/router/tl_ops_api_get_shdict_state.lua

@@ -0,0 +1,65 @@
+-- tl_ops_api
+-- en : get share dict state
+-- zn : 获取share dict状态
+-- @author iamtsm
+-- @email 1905333456@qq.com
+
+local tl_ops_rt         = require("constant.tl_ops_constant_comm").tl_ops_rt;
+local tl_ops_utils_func = require("utils.tl_ops_utils_func");
+local balance_shared    = ngx.shared.tlopsbalance
+local plugin_shared     = ngx.shared.tlopsplugin
+local waf_shared        = ngx.shared.tlopswaf
+local cache_shared      = ngx.shared.tlopscache
+local cjson             = require("cjson.safe");
+cjson.encode_empty_table_as_object(false)
+
+
+local Router = function()
+
+    local res_data = {}
+
+    local args = ngx.req.get_uri_args()
+
+    local type = args.type
+
+    if not type then
+        tl_ops_utils_func:set_ngx_req_return_ok(tl_ops_rt.args_error, "type nil");
+        return
+    end
+
+    if type and type == 'balance' then
+        res_data = {
+            free_space = balance_shared:free_space(),
+            capacity = balance_shared:capacity(),
+            keys = balance_shared:get_keys(),
+        }
+    end
+
+    if type and type == 'waf' then
+        res_data = {
+            free_space = waf_shared:free_space(),
+            capacity = waf_shared:capacity(),
+            keys = waf_shared:get_keys(),
+        }
+    end
+
+    if type and type == 'plugin' then
+        res_data = {
+            free_space = plugin_shared:free_space(),
+            capacity = plugin_shared:capacity(),
+            keys = plugin_shared:get_keys(),
+        }
+    end
+
+    if type and type == 'cache' then
+        res_data = {
+            free_space = cache_shared:free_space(),
+            capacity = cache_shared:capacity(),
+            keys = cache_shared:get_keys(),
+        }
+    end
+
+    tl_ops_utils_func:set_ngx_req_return_ok(tl_ops_rt.ok, "success", res_data);
+end
+
+return Router

api/router/tl_ops_api_set_state.lua

@@ -5,13 +5,10 @@
 -- @email 1905333456@qq.com
 
 
-local snowflake                     = require("lib.snowflake");
 local tl_ops_rt                     = require("constant.tl_ops_constant_comm").tl_ops_rt;
 local tl_ops_utils_func             = require("utils.tl_ops_utils_func");
 local tl_ops_constant_health        = require("constant.tl_ops_constant_health")
 local tl_ops_health_check_version   = require("health.tl_ops_health_check_version")
-local cache_service                 = require("cache.tl_ops_cache_core"):new("tl-ops-service");
-local tlog                          = require("utils.tl_ops_utils_log"):new("tl_ops_state");
 local shared                        = ngx.shared.tlopsbalance
 local cjson                         = require("cjson.safe");
 cjson.encode_empty_table_as_object(false)

api/tl_ops_api.lua

@@ -5,7 +5,6 @@
 -- @email 1905333456@qq.com
 
 local tlog              = require("utils.tl_ops_utils_log"):new("tl_ops_api_router");
-local tl_ops_utils_func = require("utils.tl_ops_utils_func");
 
 local _M = {}
 

api/tl_ops_api_core.lua

@@ -52,6 +52,9 @@ tl_ops_api_core["/tlops/service/set"] = require("api.router.tl_ops_api_set_servi
 -- state
 tl_ops_api_core["/tlops/state/get"] = require("api.router.tl_ops_api_get_state")
 tl_ops_api_core["/tlops/state/set"] = require("api.router.tl_ops_api_set_state")
+tl_ops_api_core["/tlops/state/shdict/get"] = require("api.router.tl_ops_api_get_shdict_state")
+tl_ops_api_core["/tlops/state/shdict/key/get"] = require("api.router.tl_ops_api_get_shdict_key_state")
+
 
 -- health
 tl_ops_api_core["/tlops/health/list"] = require("api.router.tl_ops_api_get_health")

balance/tl_ops_balance_core.lua

@@ -24,8 +24,6 @@ local cjson                             = require("cjson.safe");
 local tl_ops_manage_env                 = require("tl_ops_manage_env")
 local ngx_balancer                      = require ("ngx.balancer")
 local tl_ops_err_content                = require("err.tl_ops_err_content")
-local shared                            = ngx.shared.tlopsbalance
-
 
 local _M = {
 	_VERSION = '0.02'

cache/tl_ops_cache_dict.lua

@@ -4,7 +4,7 @@
 -- @author iamtsm
 -- @email 1905333456@qq.com
 
-local cache_dict        = ngx.shared.tlopsbalance;
+local cache_dict        = ngx.shared.tlopscache;
 local tlog              = require("utils.tl_ops_utils_log"):new("tl_ops_cache_dict");
 local tl_ops_utils_func = require("utils.tl_ops_utils_func");
 

conf/tl_ops_manage.conf

@@ -1,6 +1,7 @@
 lua_shared_dict tlopsbalance 100m;
 lua_shared_dict tlopswaf 100m;
 lua_shared_dict tlopsplugin 100m;
+lua_shared_dict tlopscache 300m;
 
 init_by_lua_block {
 	tlops = require("tl_ops_manage")

health/tl_ops_health_check.lua

@@ -8,7 +8,6 @@ local cjson                             = require("cjson.safe")
 local tlog                              = require("utils.tl_ops_utils_log"):new("tl_ops_health")
 local tl_ops_utils_func                 = require("utils.tl_ops_utils_func")
 local tl_ops_constant_health            = require("constant.tl_ops_constant_health")
-local tl_ops_status                     = require("constant.tl_ops_constant_comm").tl_ops_status;
 local tl_ops_health_check_dynamic_conf  = require("health.tl_ops_health_check_dynamic_conf")
 local tl_ops_health_check_version       = require("health.tl_ops_health_check_version")
 local nx_socket                         = ngx.socket.tcp
@@ -22,7 +21,6 @@ local mt = { __index = _M }
 
 local tl_ops_health_check, 
 tl_ops_health_check_main ,
-tl_ops_health_check_get_lock,  
 tl_ops_health_check_default_confs,
 tl_ops_health_check_nodes,
 tl_ops_health_check_node_failed,

health/tl_ops_health_check_version.lua

@@ -5,11 +5,10 @@
 -- @email 1905333456@qq.com
 
 
-local cjson                     = require("cjson.safe");
 local tlog                      = require("utils.tl_ops_utils_log"):new("tl_ops_health_check_version");
 local tl_ops_utils_func         = require("utils.tl_ops_utils_func");
 local tl_ops_constant_health    = require("constant.tl_ops_constant_health")
-local cache_dict                = ngx.shared.tlopsbalance;
+local shared                    = ngx.shared.tlopsbalance;
 
 local _M = {
 	_VERSION = '0.02'
@@ -23,15 +22,15 @@ local tl_ops_health_check_version_incr_service_version = function( service_name
         return
     end
     local key = tl_ops_utils_func:gen_node_key(tl_ops_constant_health.cache_key.service_version, service_name)
-    local service_version, _ = cache_dict:get(key)
+    local service_version, _ = shared:get(key)
 
     if not service_version then
-        service_version, _ = cache_dict:add(key, 1);
+        service_version, _ = shared:add(key, 1);
         if not service_version then 
             tlog:err(" failed to publish new service_version:" , _)
         end
     else 
-        service_version, _ = cache_dict:incr(key, 1);
+        service_version, _ = shared:incr(key, 1);
         if not service_version then 
             tlog:err(" failed to publish new service_version:" , _)
         end
@@ -46,7 +45,7 @@ end
 -- 对service_options_version更新，通知timer检查是否有新增service
 local tl_ops_health_check_version_incr_service_option_version = function(  )
     local key = tl_ops_constant_health.cache_key.service_options_version;
-    local res, _ = cache_dict:set(key, true)
+    local res, _ = shared:set(key, true)
 
     tlog:dbg("service_option_version key=" , key, ", service_option_version=",res)