summaryrefslogtreecommitdiff
path: root/src/daq/nginx-lua/s5-nginx-log.lua
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2014-10-17 02:16:27 +0200
committerChristian Pointner <equinox@spreadspace.org>2014-10-17 02:16:27 +0200
commit36b0ef59722108e4c45af2bdb8a05c97154a13b5 (patch)
tree7d6ffdf94162d9f05cc0b4a383272d867ae3b752 /src/daq/nginx-lua/s5-nginx-log.lua
parentnginx-lua now stores log data into shared dict (diff)
log data expires now
Diffstat (limited to 'src/daq/nginx-lua/s5-nginx-log.lua')
-rw-r--r--src/daq/nginx-lua/s5-nginx-log.lua51
1 files changed, 43 insertions, 8 deletions
diff --git a/src/daq/nginx-lua/s5-nginx-log.lua b/src/daq/nginx-lua/s5-nginx-log.lua
index f81bb8e..862abee 100644
--- a/src/daq/nginx-lua/s5-nginx-log.lua
+++ b/src/daq/nginx-lua/s5-nginx-log.lua
@@ -37,16 +37,49 @@
-- }
--
+local cleanup_delay = 1200
+local log_exptime = 600
+
+local log_cleanup = function(premature)
+ local sfive = ngx.shared.sfive;
+ sfive:flush_expired()
+ if premature then
+ return
+ end
+ local ok, err = ngx.timer.at(cleanup_delay, log_cleanup)
+ if not ok then
+ ngx.log(ngx.ERR, "SFive: failed to reenqueue log_cleanup: ", err)
+ sfive:delete("log:cleanup_running")
+ return
+ end
+end
+
+local start_cleanup_thread = function(sfive)
+ local ok, err, force = sfive:add("log:cleanup_running", 1)
+ if not ok then
+ if err == "exists" then
+ return
+ end
+ ngx.log(ngx.ERR, "SFive: failed to set cleanup_running flag: " .. err)
+ end
+ ok, err = ngx.timer.at(cleanup_delay, log_cleanup)
+ if not ok then
+ ngx.log(ngx.ERR, "SFive: failed to enqueue log_cleanup: ", err)
+ sfive:delete("log:cleanup_running")
+ return
+ end
+end
+
local status = ngx.var.status
if status == '200' or status == '206' then
local sfive = ngx.shared.sfive;
- local idx, err = sfive:incr("log_idx", 1)
+ local idx, err = sfive:incr("log:idx", 1)
if not idx then
- ngx.log(ngx.ERR, "SFive: incrementing index failed: " .. err)
+ ngx.log(ngx.ERR, "SFive: incrementing log index failed: " .. err)
else
local json = '{'
- json = json .. '"time": "' .. string.gsub(ngx.utctime(), " ", "T", 1) .. '",'
+ json = json .. '"time": "' .. string.gsub(ngx.utctime(), " ", "T", 1) .. 'Z",'
json = json .. '"client": "' .. ngx.var.remote_addr .. '",'
json = json .. '"port": ' .. ngx.var.remote_port .. ','
json = json .. '"ua": "' .. ngx.var.http_user_agent .. '",'
@@ -55,11 +88,13 @@ if status == '200' or status == '206' then
json = json .. '"bytes_sent": ' .. ngx.var.bytes_sent
json = json .. '}'
- local succ, err, forc = sfive:add("log_" .. idx, json, 600)
- if not succ then
- ngx.log(ngx.ERR, "SFive: adding log line (log_" .. idx ") to shared dict: " .. err)
- elseif forc then
- ngx.log(ngx.WARN, "SFive: adding log line has overwritten other log lines - consider increasing the shared dict")
+ local sfive_log = ngx.shared.sfive_log;
+ local ok, err, force = sfive_log:add(idx, json, log_exptime)
+ if not ok then
+ ngx.log(ngx.ERR, "SFive: adding log line (".. idx .. ") to log store failed: " .. err)
+ elseif force then
+ ngx.log(ngx.WARN, "SFive: adding log line has overwritten other log lines - consider increasing the log store!")
end
+ start_cleanup_thread(sfive)
end
end