add cdn.log

Author: millken

conf/dyn.conf.1002

@@ -1,5 +1,5 @@
 user  root;
-worker_processes 1;
+worker_processes 2;
 daemon off;
 error_log stderr info;
 #backtrace_log /var/log/nginx/coredump.log;
@@ -15,11 +15,23 @@ http {
 	lua_package_path '/home/github/tengcdn/lualib/?.lua;;';
 	lua_package_cpath '/home/github/tengcdn/lualib/?.so;;';
     lua_shared_dict itesty_limit 100k;
-    lua_shared_dict blocked_iplist 10m;
+    lua_shared_dict ip_whitelist 10m;
+    lua_shared_dict ip_blacklist 10m;
     lua_shared_dict req_metrics 10m;	
     lua_shared_dict req_iplist 10m;	    
 	access_by_lua_file /home/github/tengcdn/lualib/cdn/access.lua;
 
+    init_by_lua_block {
+		local config = require "cdn.config"
+		config:set("log.status", true)
+		config:set("log.level", 1)
+		
+		local logger = require "resty.logger"
+		local log = logger:open("/tmp/cdn.log")
+		log:set_level(0)
+		config:set("log.file", log)
+    }
+        
     server {
         listen 82;
         location / {
@@ -32,10 +44,29 @@ http {
         location / {
 
 			content_by_lua_block {
-				ngx.say("81")
+                local logger = require "resty.logger"
+                local buss1 = logger:open("/tmp/a/a/a/cdn.log")
+                --buss1:set_level(logger.INFO)
+                buss1:info("hello world")
+				ngx.say("ngx.DEBUG=", ngx.DEBUG, "ngx.INFO=", ngx.INFO, "ngx.NOTICE=", ngx.NOTICE, "ngx.WARN=", ngx.WARN, "ngx.ERR=", ngx.ERR)
 			}
         }
 
+        location /test {
+        	access_by_lua_block {
+        		local config = require "cdn.config"
+        		config:set("test", "miss me !")
+        	}
+	        content_by_lua_block {
+	        	local log = require "cdn.log"
+	        	log:info("info")
+	        	log:debug("debug")
+	        	log:error("error")
+	        	local config = require "cdn.config"
+	        	ngx.say(config:get("test"))
+	        }
+        }
+        
         location /limit {
 			access_by_lua_block {
 				local limits = require("resty.iresty_limits")

conf/dyn.conf.1003

@@ -11,12 +11,19 @@ events {
 
 http {
 	lua_code_cache off;
-	#lua_package_path '/home/github/tengcdn/lualib/?.lua;;';
+	lua_package_path '/home/github/tengcdn/lualib/?.lua;;';
 	lua_package_cpath '/home/github/tengcdn/lualib/?.so;;';
     lua_shared_dict itesty_limit 100k;
-    lua_shared_dict blocked_iplist 10m;
+    lua_shared_dict ip_blacklist 10m;
+    lua_shared_dict ip_whitelist 10m;
     lua_shared_dict req_metrics 10m;	
-    lua_shared_dict req_iplist 10m;	    
+    lua_shared_dict req_iplist 10m;
+    
+    init_by_lua_block {
+    	local log = require("cdn.log")
+    	local logger = log.new()
+    }
+    	    
 	access_by_lua_block {
 		require "cdn.access"
 	}

lualib/cdn/access.lua

@@ -15,7 +15,8 @@ local ngx_now = ngx.now
 local ngx_exit = ngx.exit
 local ngx_md5 = ngx.md5
 local ngx_time = ngx.time
-local blocked_iplist = ngx.shared.blocked_iplist
+local ip_blacklist = ngx.shared.ip_blacklist
+local ip_whitelist = ngx.shared.ip_whitelist
 local req_iplist = ngx.shared.req_iplist
 local req_metrics = ngx.shared.req_metrics
 
@@ -24,8 +25,13 @@ local cookies = cookie.get()
 local COOKIE_NAME = "__waf_uid"
 local COOKIE_KEY = "xg0j21"
 
-if blocked_iplist:get(client_ip) ~= nil then
-	if blocked_iplist:get(client_ip) >= ngx_now() then
+if ip_whitelist:get(client_ip) ~= nil then
+	if ip_whitelist:get(client_ip) >= ngx_now() then
+		return
+	end
+end
+if ip_blacklist:get(client_ip) ~= nil then
+	if ip_blacklist:get(client_ip) >= ngx_now() then
 		ngx_exit(444)
 	end
 end

lualib/cdn/config.lua

@@ -0,0 +1,42 @@
+local ngx = ngx
+local   tostring, ipairs, pairs, type, tonumber, next, unpack =
+        tostring, ipairs, pairs, type, tonumber, next, unpack
+
+local _M = {
+    _VERSION = '0.01',
+	config = {},
+}
+
+local mt = { __index = _M }
+
+function _M.ctx(self)
+    local id = tostring(self)
+    local ctx = ngx.ctx[id]
+    if not ctx then
+        ctx = {
+            config = {},
+        }
+        ngx.ctx[id] = ctx
+    end
+    return ctx
+end
+
+
+function _M.set(self, param, value)
+    if ngx.get_phase() == "init" then
+        self.config[param] = value
+    else
+        self:ctx().config[param] = value
+    end
+end
+
+function _M.get(self, param)
+    local p = self:ctx().config[param]
+    if p == nil then
+        return self.config[param]
+    else
+        return p
+    end
+end
+
+return _M

lualib/cdn/log.lua

@@ -0,0 +1,56 @@
+local logger = require "resty.logger"
+local config = require "cdn.config"
+local ngx = ngx
+local _M = {
+    _VERSION = '0.01',
+}
+-- log level
+local LVL_DEBUG = 1
+local LVL_INFO  = 2
+local LVL_ERROR = 3
+local LVL_NONE  = 999
+
+local mt = { __index = _M }
+
+function _M.info(self, ... )
+	if config:get('log.status') then
+		local log_level = config:get('log.level') or LVL_NONE
+		if log_level and log_level > LVL_INFO then return end
+
+		local filer = config:get('log.file')
+		if filer then
+			filer:info(...)
+		else
+			ngx.log(ngx.INFO, ...)
+		end
+	end
+end
+
+function _M.debug(self, ... )
+	if config:get('log.status') then
+		local log_level = config:get('log.level') or LVL_NONE
+		if log_level and log_level > LVL_DEBUG then return end
+
+		local filer = config:get('log.file')
+		if filer then
+			filer:debug(...)
+		else
+			ngx.log(ngx.DEBUG, ...)
+		end
+	end
+end
+
+function _M.error(self, ... )
+	if config:get('log.status') then
+		local log_level = config:get('log.level') or LVL_NONE
+		if log_level and log_level > LVL_ERROR then return end
+	
+		local filer = config:get('log.file')
+		if filer then
+			filer:error(...)
+		else
+			ngx.log(ngx.ERR, ...)
+		end
+	end
+end
+return _M

lualib/resty/logger.lua

@@ -10,8 +10,8 @@ local bor = bit.bor
 local setmetatable = setmetatable
 local localtime 	= ngx.localtime()
 local ngx 			= ngx
-local type 			= type
-
+local   tostring, ipairs, pairs, type, tonumber, next, unpack =
+        tostring, ipairs, pairs, type, tonumber, next, unpack
 
 ffi.cdef[[
 int write(int fd, const char *buf, int nbyte);
@@ -32,60 +32,51 @@ local LVL_INFO  = 2
 local LVL_ERROR = 3
 local LVL_NONE  = 999
 
-module(...)
-
-_VERSION = '0.1'
+local _M = {
+    _VERSION = '0.01',
+}
 
 local mt = { __index = _M }
 
-function new(self, log_type, logfile)
+function _M.open(self, logfile)
 	local log_level, log_fd = nil
 
-	local level = nil
-	if 'debug' == log_type then 
-		level = LVL_DEBUG
-	elseif 'info' == log_type then 
-		level = LVL_INFO
-	elseif 'error' == log_type then 
-		level = LVL_ERROR
-	else 
-		level = LVL_NONE
+	local level = LVL_NONE
+	local fd = C.open(logfile, bor(O_RDWR, O_CREAT, O_APPEND), bor(S_IRWXU, S_IRGRP, S_IROTH)) 
+	if fd == -1 then
+		ngx.log(ngx.ERR, "open log file " .. logfile .. " failed, errno: " .. tostring(ffi.errno()))
 	end
-
 	return setmetatable({
 		log_level = level,
-		log_fd = C.open(logfile, bor(O_RDWR, O_CREAT, O_APPEND), bor(S_IRWXU, S_IRGRP, S_IROTH)),
+		log_fd = fd,
 	},mt)
 end
 
+function _M.set_level(self, level)
+	self.log_level = level
+end
 
-function debug(self, msg)
+function _M.debug(self, msg)
 	if self.log_level > LVL_DEBUG then return end;
 
-	local c = localtime .. "|" .."D" .. "|" .. msg .. "\n";
+	local c = localtime .. " [DEBUG] " .. msg .. "\n";
 	C.write(self.log_fd, c, #c);
 end
 
-function info(self, msg)
+function _M.info(self, msg)
 	if self.log_level > LVL_INFO then return end;
 
-	local c = localtime .. "|" .."I" .. "|" .. msg .. "\n";
+	local c = localtime .. " [INFO] " .. msg .. "\n";
 	C.write(self.log_fd, c, #c);
 end
 
 
-function error(self, msg)
+function _M.error(self, msg)
 	if self.log_level > LVL_ERROR then return end;
 
-	local c = localtime .. "|" .."E" .. "|" .. msg .. "\n";
+	local c = localtime .. " [ERROR] " .. msg .. "\n";
 	C.write(self.log_fd, c, #c);
 end
 
-local class_mt = { 
-	-- to prevent use of casual module global variables
-	__newindex = function (table, key, val)
-		error('attempt to write to undeclared variable "' .. key .. '"')
-	end 
-}
+return _M
 
-setmetatable(_M, class_mt)