diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua index 75f6ac42f6..97faa1d266 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua @@ -1,6 +1,6 @@ -- xml_handler.lua -- Part of FusionPBX --- Copyright (C) 2015 Mark J Crane +-- Copyright (C) 2015-2018 Mark J Crane -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -39,14 +39,10 @@ --set the cache if not XML_STRING then - --log cache error - if (debug["cache"]) then - freeswitch.consoleLog("warning", "[xml_handler] " .. acl_cache_key .. " can not be get from memcache: " .. tostring(err) .. "\n"); - end --log cache error if (debug["cache"]) then - freeswitch.consoleLog("warning", "[xml_handler] configuration:acl.conf can not be get from memcache: " .. tostring(err) .. "\n"); + freeswitch.consoleLog("warning", "[xml_handler] configuration:acl.conf can not be get from the cache: " .. tostring(err) .. "\n"); end --set a default value @@ -125,19 +121,12 @@ local ok, err = cache.set(acl_cache_key, XML_STRING, expire["acl"]); if debug["cache"] then if ok then - freeswitch.consoleLog("notice", "[xml_handler] " .. acl_cache_key .. " stored in memcache\n"); + freeswitch.consoleLog("notice", "[xml_handler] " .. acl_cache_key .. " stored in the cache\n"); else - freeswitch.consoleLog("warning", "[xml_handler] " .. acl_cache_key .. " can not be stored in memcache: " .. tostring(err) .. "\n"); + freeswitch.consoleLog("warning", "[xml_handler] " .. acl_cache_key .. " can not be stored in the cache: " .. tostring(err) .. "\n"); end end - --send the xml to the console - if (debug["xml_string"]) then - local file = assert(io.open(temp_dir .. "/acl.conf.xml", "w")); - file:write(XML_STRING); - file:close(); - end - --send to the console if (debug["cache"]) then freeswitch.consoleLog("notice", "[xml_handler] " .. acl_cache_key .. " source: database\n"); @@ -148,3 +137,10 @@ freeswitch.consoleLog("notice", "[xml_handler] " .. acl_cache_key .. " source: memcache\n"); end end --if XML_STRING + +--send the xml to the console + if (debug["xml_string"]) then + local file = assert(io.open(temp_dir .. "/acl.conf.xml", "w")); + file:write(XML_STRING); + file:close(); + end