From 3e1c681bae353a6c09ccba00d6b11eb75489880c Mon Sep 17 00:00:00 2001 From: 346273773 Date: Fri, 2 Jun 2017 14:36:22 +0800 Subject: [PATCH] Optimize the test_ip function in the request_tester.lua file --- verynginx/lua_script/module/request_tester.lua | 8 +++++++- verynginx/lua_script/module/summary.lua | 4 +--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/verynginx/lua_script/module/request_tester.lua b/verynginx/lua_script/module/request_tester.lua index 2137d223..6e22896c 100644 --- a/verynginx/lua_script/module/request_tester.lua +++ b/verynginx/lua_script/module/request_tester.lua @@ -93,7 +93,13 @@ function _M.test_uri( condition ) end function _M.test_ip( condition ) - local remote_addr = ngx.var.remote_addr + local remote_addr = ngx.req.get_headers()["X_real_ip"] + if remote_addr == nil then + remote_addr = ngx.req.get_headers()["X_Forwarded_For"] + end + if remote_addr == nil then + remote_addr = ngx.var.remote_addr + end return _M.test_var( condition['operator'], condition['value'], remote_addr ) end diff --git a/verynginx/lua_script/module/summary.lua b/verynginx/lua_script/module/summary.lua index e93d3d76..ffb06802 100644 --- a/verynginx/lua_script/module/summary.lua +++ b/verynginx/lua_script/module/summary.lua @@ -215,7 +215,6 @@ function _M.report() count = dict:get( v ) end - if record_key ~= nil then if record_table[record_key] == nil then record_table[record_key] = {} @@ -226,8 +225,7 @@ function _M.report() record_table[record_key]["status"][status] = dict:get( v ) elseif time ~= nil then record_table[record_key]["time"] = time - elseif - size ~= nil then + elseif size ~= nil then record_table[record_key]["size"] = size elseif count ~= nil then record_table[record_key]["count"] = count