fix default-server-http.conf

src/common/confs/default-server-http.conf

@@ -33,13 +33,15 @@ server {
 
 	log_by_lua_block {
 
-		local utils		= require "bunkerweb.utils"
-		local logger	= require "bunkerweb.logger"
-		local datastore	= require "bunkerweb.datastore"
+		local utils			= require "bunkerweb.utils"
+		local clogger		= require "bunkerweb.logger"
+		local cdatastore	= require "bunkerweb.datastore"
+		local helpers		= require "bunkerweb.helpers"
+		local cjson			= require "cjson"
 
 		-- Start log phase
-		logger:new("LOG-DEFAULT")
-		datastore:new()
+		local logger	= clogger:new("LOG-DEFAULT")
+		local datastore	= cdatastore:new()
 		logger:log(ngx.INFO, "log_default phase started")
 
 		-- Get plugins
@@ -48,28 +50,34 @@ server {
 			logger:log(ngx.ERR, "can't get plugins from datastore : " .. err)
 			return false
 		end
+		plugins = cjson.decode(plugins)
 
-		-- Call log() methods
+		-- Call log_default() methods
 		logger:log(ngx.INFO, "calling log_default() methods of plugins ...")
 		for i, plugin in ipairs(plugins) do
-			local plugin_lua, err = helpers.new_plugin(plugin.id)
+			-- Require call
+			local plugin_lua, err = helpers.require_plugin(plugin.id)
 			if plugin_lua == false then
 				logger:log(ngx.ERR, err)
-			else
+			elseif plugin_lua == nil then
 				logger:log(ngx.INFO, err)
-			end
-			if plugin_lua ~= nil then
-				local ok, ret = helpers.call_plugin(plugin_lua, "log_default")
-				if ok == false then
-					logger:log(ngx.ERR, ret)
-				elseif ok == nil then
-					logger:log(ngx.INFO, ret)
-				else
-					if ret.ret then
-						logger:log(ngx.INFO, plugin.id .. ":log_default() call successful : " .. ret.msg)
+			else
+				-- Check if plugin has log method
+				if plugin_lua.log_default ~= nil then
+					-- New call
+					local ok, plugin_obj = helpers.new_plugin(plugin_lua)
+					if not ok then
+						logger:log(ngx.ERR, plugin_obj)
 					else
-						logger:log(ngx.ERR, plugin.id .. ":log_default() call failed : " .. ret.msg)
+						local ok, ret = helpers.call_plugin(plugin_obj, "log")
+						if not ok then
+							logger:log(ngx.ERR, ret)
+						else
+							logger:log(ngx.INFO, plugin.id .. ":log_default() call successful : " .. ret.msg)
+						end
 					end
+				else
+					logger:log(ngx.INFO, "skipped execution of " .. plugin.id .. " because method log_default() is not defined")
 				end
 			end
 		end