From 6340720a0d6ce9a5fb9d63b8896c78df02f5670e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 17 Oct 2014 03:15:09 +0200
Subject: sfive nginx-lua plugin works now

---
 src/daq/nginx-lua/s5-nginx-log.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/daq/nginx-lua/s5-nginx-log.lua')

diff --git a/src/daq/nginx-lua/s5-nginx-log.lua b/src/daq/nginx-lua/s5-nginx-log.lua
index 862abee..c862343 100644
--- a/src/daq/nginx-lua/s5-nginx-log.lua
+++ b/src/daq/nginx-lua/s5-nginx-log.lua
@@ -41,14 +41,14 @@ local cleanup_delay = 1200
 local log_exptime = 600
 
 local log_cleanup = function(premature)
-   local sfive = ngx.shared.sfive;
+   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)
+      ngx.log(ngx.ERR, "SFive(log): failed to reenqueue log_cleanup: ", err)
       sfive:delete("log:cleanup_running")
       return
    end
@@ -60,11 +60,11 @@ local start_cleanup_thread = function(sfive)
       if err == "exists" then
          return
       end
-      ngx.log(ngx.ERR, "SFive: failed to set cleanup_running flag: " .. err)
+      ngx.log(ngx.ERR, "SFive(log): 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)
+      ngx.log(ngx.ERR, "SFive(log): failed to enqueue log_cleanup: ", err)
       sfive:delete("log:cleanup_running")
       return
    end
@@ -73,10 +73,10 @@ end
 local status = ngx.var.status
 
 if status == '200' or status == '206' then
-   local sfive = ngx.shared.sfive;
+   local sfive = ngx.shared.sfive
    local idx, err = sfive:incr("log:idx", 1)
    if not idx then
-      ngx.log(ngx.ERR, "SFive: incrementing log index failed: " .. err)
+      ngx.log(ngx.ERR, "SFive(log): incrementing log index failed: " .. err)
    else
       local json = '{'
       json = json .. '"time": "' .. string.gsub(ngx.utctime(), " ", "T", 1) .. 'Z",'
@@ -88,12 +88,12 @@ if status == '200' or status == '206' then
       json = json .. '"bytes_sent": ' .. ngx.var.bytes_sent
       json = json .. '}'
 
-      local sfive_log = ngx.shared.sfive_log;
+      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)
+         ngx.log(ngx.ERR, "SFive(log): 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!")
+         ngx.log(ngx.WARN, "SFive(log): adding log line has overwritten other log lines - consider increasing the log store!")
       end
       start_cleanup_thread(sfive)
    end
-- 
cgit v1.2.3