feat: 补充定时器异常退出日志

iamtsm · iamtsm · commit 6f8cd37f6205 · 2023-07-27T18:31:06.000+08:00
feat: 补充store存储前一次索引
fix: 修复reload导致自检定时器没有重启
fix: 修复登录页面名称错误
fix: 修复ssl调用代码错误
fix: 优化一些调用代码
diff --git a/balance/count/tl_ops_balance_count_core.lua b/balance/count/tl_ops_balance_count_core.lua
@@ -57,6 +57,7 @@ end
 -- 统计balance次数周期默认为5min，可调整配置
 tl_ops_balance_count_timer = function(premature, args)
 	if premature then
+        tlog:err("premature")
 		return
     end
 
diff --git a/balance/tl_ops_balance_core.lua b/balance/tl_ops_balance_core.lua
@@ -129,7 +129,7 @@ function _M:tl_ops_balance_core_filter(ctx)
         balance_count_node.tl_ops_balance_count_incr_node_fail(node.service, node_id)
         -- 负载失败 -- 限流统计器
         tl_ops_limit:tl_ops_limit_fuse_incr_fail(node.service, node_id);
-        
+
         tl_ops_err_content:err_content_rewrite_to_balance(node.service .. ":" .. node.name, "offline", balance_mode, tl_ops_constant_balance.cache_key.offline, "")
         return
     end
@@ -164,7 +164,7 @@ function _M:tl_ops_balance_core_balance(ctx)
     ngx.header[tl_ops_constant_balance.proxy_state] = "online"
     ngx.header[tl_ops_constant_balance.proxy_mode] = tlops_ups_mode
     ngx.header[tl_ops_constant_balance.proxy_prefix] = tlops_ups_api_prefix
-    
+
     local ok, err = ngx_balancer.set_current_peer(tlops_ups_node.ip, tlops_ups_node.port)
     if ok then
         ngx_balancer.set_timeouts(3, 60, 60)
diff --git a/bin/install_centeros.sh b/bin/install_centeros.sh
@@ -6,7 +6,7 @@ TL_OPS_PATH="/usr/local/tl-ops-manage/"
 TL_OPS_CONF_PATH="/usr/local/tl-ops-manage/conf/tl_ops_manage.conf"
 TL_OPS_LUA_PATH="/usr/local/openresty/lualib/?.lua;;/usr/local/tl-ops-manage/?.lua;;"
 TL_OPS_LUAC_PATH="/usr/local/openresty/lualib/?.so;;"
-TL_OPS_VER="v3.4.5"
+TL_OPS_VER="v3.4.6"
 
 echo_msg(){
     cur_time=$(date "+%Y-%m-%d %H:%M:%S")
diff --git a/bin/install_ubuntu.sh b/bin/install_ubuntu.sh
@@ -6,7 +6,7 @@ TL_OPS_PATH="/usr/local/tl-ops-manage/"
 TL_OPS_CONF_PATH="/usr/local/tl-ops-manage/conf/tl_ops_manage.conf"
 TL_OPS_LUA_PATH="/usr/local/openresty/lualib/?.lua;;/usr/local/tl-ops-manage/?.lua;;"
 TL_OPS_LUAC_PATH="/usr/local/openresty/lualib/?.so;;"
-TL_OPS_VER="v3.4.5"
+TL_OPS_VER="v3.4.6"
 
 echo_msg(){
     cur_time=$(date "+%Y-%m-%d %H:%M:%S")
diff --git a/cache/tl_ops_cache_cus.lua b/cache/tl_ops_cache_cus.lua
@@ -37,24 +37,35 @@ end
 
 
 function _M:new()
+    local default_cus = {
+        get =  function(key)
+            return nil
+        end,
+        set = function(key, value)
+            return nil
+        end,
+        del = function(key)
+            return nil
+        end
+    }
     if not use_cus or use_cus == 'none' then
-        return nil
+        return default_cus
     end
 
     local status, cus = pcall(require, "cache.tl_ops_cache_" .. use_cus)
     if status then
         if cus and type(cus) == 'table' then
             if type(cus.new) ~= 'function' then
-                return nil
+                return default_cus
             end
             if type(cus.get) ~= 'function' then
-                return nil
+                return default_cus
             end
             if type(cus.set) ~= 'function' then
-                return nil
+                return default_cus
             end
             if type(cus.del) ~= 'function' then
-                return nil
+                return default_cus
             end
         end
     end
diff --git a/cache/tl_ops_cache_store.lua b/cache/tl_ops_cache_store.lua
@@ -61,7 +61,7 @@ function _M:del(key)
     end
 
     -- set seek to 4GB 等价删除索引
-    self.cache_store:store_index(key, 4 * 1024 * 1024 * 1024) 
+    self.cache_store:store_index(key, 4 * 1024 * 1024 * 1024)
 
     tlog:dbg("del cache store ok key=" .. key)
 
diff --git a/constant/tl_ops_constant_service.lua b/constant/tl_ops_constant_service.lua
@@ -8,7 +8,7 @@ local tl_ops_constant_service = {
         service_rule = "tl_ops_service_rule",
     },
     list = {
-        
+
     },
     demo = {
         id = 1,
diff --git a/doc/change.md b/doc/change.md
@@ -1,6 +1,21 @@
 
 ## 事务更新日程
 
+2023-07-27
+
+    1. 补充定时器异常退出日志
+
+    2. 修复登录页面名称错误
+
+    3. 修复reload导致自检定时器没有重启
+
+    4. 修复ssl调用代码错误
+
+    5. 优化一些调用代码
+
+    6. 事务日程调整
+
+
 2023-04-22
 
     1. api规则细节限制优化
@@ -38,7 +53,7 @@
 
     2. 支持waf详情多维度统计和展示
 
-    3. 支持管理后台退出登陆
+    3. 支持管理后台退出登录
 
     4. 优化代码注释
 
diff --git a/gitbook/SUMMARY.md b/gitbook/SUMMARY.md
@@ -84,7 +84,7 @@
 
         * [使用配置](usage/ssl/README.md)
 
-    * [登陆认证插件](code/auth/README.md)
+    * [登录认证插件](code/auth/README.md)
 
         * [使用配置](usage/auth/README.md)
 
diff --git a/gitbook/code/auth/README.md b/gitbook/code/auth/README.md
@@ -1,13 +1,13 @@
-# 登陆认证插件
+# 登录认证插件
 
-登陆认证插件主要为管理后台系统提供一个操作可控的权限认证，实现的方式是在 `tl_ops_process_before_init_rewrite` 阶段进行cookie或者header验证，对于需要拦截验证的链接进行验证，当然，拦截链接是可视化配置的，可以根据需要自定义
+登录认证插件主要为管理后台系统提供一个操作可控的权限认证，实现的方式是在 `tl_ops_process_before_init_rewrite` 阶段进行cookie或者header验证，对于需要拦截验证的链接进行验证，当然，拦截链接是可视化配置的，可以根据需要自定义
 
-登陆插件数据主要分为两个子模块，一个是自定义配置模块，一个是账号密码模块
+登录插件数据主要分为两个子模块，一个是自定义配置模块，一个是账号密码模块
 
 
 ### 拦截配置
 
-我们先看一下拦截配置的数据定义，主要包含几个方面，拦截的api，拦截api白名单，拦截后返回的内容，登陆验证身份相关。
+我们先看一下拦截配置的数据定义，主要包含几个方面，拦截的api，拦截api白名单，拦截后返回的内容，登录验证身份相关。
 
 ```lua
 # 代码位置 : plugins/tl_ops_auth/tl_ops_plugin_constant.lua
@@ -24,9 +24,9 @@ login = {
         "/tlops/auth/login",
         "/tlopsmanage/lib/",
     },
-    auth_time = 3600,               -- 登陆后session有效时间
-    auth_cid = "_tl_t",             -- 登陆后cookie值key
-    auth_hid = "Tl-Auth-Rid",       -- 登陆后header值key
+    auth_time = 3600,               -- 登录后session有效时间
+    auth_cid = "_tl_t",             -- 登录后cookie值key
+    auth_hid = "Tl-Auth-Rid",       -- 登录后header值key
 },
 ```
 
@@ -67,7 +67,7 @@ end
 ```
 
 进入 `auth_core` 方法，看实现逻辑为拿到设置配置后，判断当前uri是否需要拦截，如果需要拦截， 判断cookie或者header中的sessionkey是否有效，
-如果无效，则是没有登陆，返回自定义的配置内容。
+如果无效，则是没有登录，返回自定义的配置内容。
 
 ```lua
 # 代码位置 : plugins/tl_ops_auth/auth.lua
diff --git a/health/tl_ops_health.lua b/health/tl_ops_health.lua
@@ -14,15 +14,15 @@ local _M = {}
 function _M:init(  )
 
     --给定配置启动健康检查，支持动态加载已有服务变更配置
-    local health_check = tl_ops_health_check:new( 
+    local health_check = tl_ops_health_check:new(
         tl_ops_constant_health.options,  tl_ops_constant_health.service
     );
     health_check:tl_ops_health_check_start();
 
-    
+
     --动态加载新增配置
     tl_ops_health_check_dynamic_conf.dynamic_conf_add_start()
-    
+
 
     --默认初始化一次version
     for i = 1, #tl_ops_constant_health.options do
@@ -32,7 +32,7 @@ function _M:init(  )
             tl_ops_health_check_version.incr_service_version(service_name)
         end
     end
-	
+
 	tl_ops_health_check_version.incr_service_option_version()
 
 end
diff --git a/health/tl_ops_health_check.lua b/health/tl_ops_health_check.lua
@@ -19,8 +19,8 @@ local _M = {
 }
 local mt = { __index = _M }
 
-local tl_ops_health_check, 
-tl_ops_health_check_main ,
+local tl_ops_health_check,
+tl_ops_health_check_main,
 tl_ops_health_check_default_confs,
 tl_ops_health_check_nodes,
 tl_ops_health_check_node_failed,
@@ -148,6 +148,10 @@ end
 -- 创建健康检查定时器
 tl_ops_health_check = function(premature, conf)
 	if premature then
+		tlog:err("premature")
+
+		-- 重启时，清空所有定时器记录
+		shared:set(tl_ops_constant_health.cache_key.timers, nil)
 		return
 	end
 
diff --git a/health/tl_ops_health_check_dynamic_conf.lua b/health/tl_ops_health_check_dynamic_conf.lua
@@ -72,7 +72,7 @@ local tl_ops_health_check_dynamic_conf_add_core = function(options, services)
 		shared:set(tl_ops_constant_health.cache_key.service_options_version, nil)
 		return
 	end
-	
+
 	-- 如果有，查看cache service中的所有服务是否都已启动timer，如果没有, 补充启动相应service timer
 	local timers_list = cjson.decode(timers_str)
 	for service_name, nodes in pairs(services) do
@@ -83,7 +83,7 @@ local tl_ops_health_check_dynamic_conf_add_core = function(options, services)
 			end
 		end
 		if service_name_exist == true then
-			tlog:dbg("[add-check] timer exist , service_name=",service_name)
+			tlog:dbg("[add-check] timer exist, service_name=",service_name)
 		else
 			local matcher_options = tl_ops_health_check_dynamic_conf_get_option( options, service_name)
 			tlog:dbg("[add-check] new timer done, service_name=",service_name, ",matcher_options=",matcher_options)
@@ -131,6 +131,7 @@ end
 -- 加载新增配置的周期为10s
 tl_ops_health_check_dynamic_conf_add_timer_check = function(premature, args)
 	if premature then
+		tlog:err("premature")
 		return
 	end
 
diff --git a/limit/fuse/tl_ops_limit_fuse_check.lua b/limit/fuse/tl_ops_limit_fuse_check.lua
@@ -189,6 +189,10 @@ end
 
 tl_ops_limit_fuse = function(premature, conf)
     if premature then
+		tlog:err("premature")
+
+		-- 重启时，清空所有定时器记录
+		shared:set(tl_ops_constant_limit.fuse.cache_key.timers, nil)
 		return
 	end
 
diff --git a/limit/fuse/tl_ops_limit_fuse_check_dynamic_conf.lua b/limit/fuse/tl_ops_limit_fuse_check_dynamic_conf.lua
@@ -134,6 +134,7 @@ end
 -- 加载新增配置的周期为10s
 tl_ops_limit_fuse_check_dynamic_conf_add_timer_check = function(premature, args)
 	if premature then
+		tlog:err("premature")
 		return
 	end
 
diff --git a/limit/fuse/tl_ops_limit_fuse_check_version.lua b/limit/fuse/tl_ops_limit_fuse_check_version.lua
@@ -41,7 +41,8 @@ end
 
 -- 对service_options_version更新，通知timer检查是否有新增service
 local tl_ops_limit_fuse_version_incr_service_option_version = function(  )
-    local res, _ = cache_dict:set(tl_ops_constant_limit.fuse.cache_key.service_options_version, true)
+    local key = tl_ops_constant_limit.fuse.cache_key.service_options_version
+    local res, _ = cache_dict:set(key, true)
 
     tlog:dbg("service_option_version key=" , key, ", service_option_version=",res)
 
diff --git a/limit/tl_ops_limit_leak_bucket.lua b/limit/tl_ops_limit_leak_bucket.lua
@@ -82,7 +82,7 @@ end
 
 -- get leak with lazy generate
 -- block 漏桶流速单位
-local tl_ops_limit_leak_bucket = function( block )
+function _M:tl_ops_limit_leak_bucket( block )
     local capacity = shared:get(self.keys.capacity)
     if not capacity then
         return false
@@ -154,7 +154,7 @@ function _M:tl_ops_limit_leak( block )
         return false
     end
 
-    local leak = tl_ops_limit_leak_bucket( block )
+    local leak = self:tl_ops_limit_leak_bucket( block )
     if not leak or leak == false then
         return false
     end
diff --git a/limit/tl_ops_limit_sliding_window.lua b/limit/tl_ops_limit_sliding_window.lua
@@ -79,7 +79,7 @@ end
 
 -- try sliding, 尝试通过滑动窗口
 -- block : 请求大小
-local tl_ops_limit_sliding_window = function( block )
+function _M:tl_ops_limit_sliding_window( block )
 
     local window = shared:get(self.keys.window)
     if not window then
@@ -116,7 +116,7 @@ local tl_ops_limit_sliding_window = function( block )
             if not count then
                 count = 0
             end
-            local res, _ = shared:del(self.keys.count .. i)
+            local res, _ = shared:delete(self.keys.count .. i)
             if not res then
                 return false
             end
@@ -190,7 +190,7 @@ function _M:tl_ops_sliding_window( block )
         return false
     end
 
-    local sliding = tl_ops_limit_sliding_window( block )
+    local sliding = self:tl_ops_limit_sliding_window( block )
     if not sliding or sliding == false then
         return false
     end
diff --git a/limit/tl_ops_limit_token_bucket.lua b/limit/tl_ops_limit_token_bucket.lua
@@ -104,7 +104,7 @@ end
 
 -- get token with lazy generate
 -- block 取用令牌数量
-local tl_ops_limit_token_bucket = function( block )
+function _M:tl_ops_limit_token_bucket( block )
     local capacity = shared:get(self.keys.capacity)
     if not capacity then
         return false
@@ -194,7 +194,7 @@ function _M:tl_ops_limit_token( block )
         return false
     end
 
-    local token = tl_ops_limit_token_bucket( block )
+    local token = self:tl_ops_limit_token_bucket( block )
     if not token or token == false then
         return false
     end
diff --git a/plugins/tl_ops_auth/tl_ops_plugin_constant.lua b/plugins/tl_ops_auth/tl_ops_plugin_constant.lua
@@ -31,7 +31,7 @@ local default_content_page = [[
         </form>
         <div class="layui-form-item" style="margin-top: 30px;">
             <div class="layui-input-block">
-                <button class="layui-btn" onclick="tl_ops_manage_login()" style="letter-spacing: 40px;text-indent: 30px;">登陆</button>
+                <button class="layui-btn" onclick="tl_ops_manage_login()" style="letter-spacing: 40px;text-indent: 30px;">登录</button>
             </div>
         </div>
     </div>
diff --git a/plugins/tl_ops_ssl/ssl.lua b/plugins/tl_ops_ssl/ssl.lua
@@ -27,8 +27,8 @@ local get_pem_key_cache = function(host)
     end
 
     local list = cjson.decode(list_str)
-    if not list then 
-        return nil 
+    if not list then
+        return nil
     end
 
     for i = 1, #list do
@@ -45,7 +45,7 @@ end
 -- 核心逻辑
 function _M:ssl_core()
 
-    local host = ssl.server_name()        
+    local host = ssl.server_name()
 
     local ok, err = ssl.clear_certs()
     if not ok then
@@ -71,8 +71,7 @@ function _M:ssl_core()
         return false, err
     end
 
-    local passphrase = nil
-    local der_pkey, err = ssl.priv_key_pem_to_der(host_pem_key.key, passphrase)
+    local der_pkey, err = ssl.priv_key_pem_to_der(host_pem_key.key)
     if not der_pkey then
         tlog:err("failed to convert private key, ",err,",key=",host_pem_key.key)
         return false, err
diff --git a/plugins/tl_ops_sync/sync.lua b/plugins/tl_ops_sync/sync.lua
@@ -20,6 +20,7 @@ local mt = { __index = _M }
 -- 核心逻辑
 local tl_ops_sync_timer = function(premature, args)
 	if premature then
+        tlog:err("premature")
 		return
     end
     
diff --git a/plugins/tl_ops_sync_cluster/sync_cluster.lua b/plugins/tl_ops_sync_cluster/sync_cluster.lua
diff --git a/plugins/tl_ops_time_alert/time_alert.lua b/plugins/tl_ops_time_alert/time_alert.lua
diff --git a/tl_ops_manage_env.lua b/tl_ops_manage_env.lua
diff --git a/utils/tl_ops_utils_store.lua b/utils/tl_ops_utils_store.lua
diff --git a/waf/count/tl_ops_waf_count_core.lua b/waf/count/tl_ops_waf_count_core.lua
diff --git a/waf/tl_ops_waf_core_cookie.lua b/waf/tl_ops_waf_core_cookie.lua
diff --git a/web/template/loginpage.html b/web/template/loginpage.html
