From 8a1c43775ca9018a88123186984cc72a08105700 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 11 Jan 2018 12:31:25 -0700 Subject: [PATCH] Update translate.conf.lua --- .../scripts/configuration/translate.conf.lua | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/translate.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/translate.conf.lua index ad4e5a5a4f..f77cfb1f04 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/translate.conf.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/translate.conf.lua @@ -1,6 +1,6 @@ -- xml_handler.lua -- Part of FusionPBX --- Copyright (C) 2017 Mark J Crane +-- Copyright (C) 2018 Mark J Crane -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -33,12 +33,12 @@ if not XML_STRING then --log cache error if (debug["cache"]) then - freeswitch.consoleLog("warning", "[xml_handler] " .. translate_cache_key .. " can not be get from memcache: " .. tostring(err) .. "\n"); + freeswitch.consoleLog("warning", "[xml_handler] " .. translate_cache_key .. " can not be get from the cache: " .. tostring(err) .. "\n"); end --log cache error if (debug["cache"]) then - freeswitch.consoleLog("warning", "[xml_handler] configuration:translate.conf can not be get from memcache: " .. tostring(err) .. "\n"); + freeswitch.consoleLog("warning", "[xml_handler] configuration:translate.conf can not be get from the cache: " .. tostring(err) .. "\n"); end --set a default value @@ -116,19 +116,12 @@ local ok, err = cache.set(translate_cache_key, XML_STRING, expire["translate"]); if debug["cache"] then if ok then - freeswitch.consoleLog("notice", "[xml_handler] " .. translate_cache_key .. " stored in memcache\n"); + freeswitch.consoleLog("notice", "[xml_handler] " .. translate_cache_key .. " stored in the cache\n"); else - freeswitch.consoleLog("warning", "[xml_handler] " .. translate_cache_key .. " can not be stored in memcache: " .. tostring(err) .. "\n"); + freeswitch.consoleLog("warning", "[xml_handler] " .. translate_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 .. "/translate.conf.xml", "w")); - file:write(XML_STRING); - file:close(); - end - --send to the console if (debug["cache"]) then freeswitch.consoleLog("notice", "[xml_handler] " .. translate_cache_key .. " source: database\n"); @@ -136,6 +129,13 @@ else --send to the console if (debug["cache"]) then - freeswitch.consoleLog("notice", "[xml_handler] " .. translate_cache_key .. " source: memcache\n"); + freeswitch.consoleLog("notice", "[xml_handler] " .. translate_cache_key .. " source: cache\n"); end end --if XML_STRING + +--send the xml to the console + if (debug["xml_string"]) then + local file = assert(io.open(temp_dir .. "/translate.conf.xml", "w")); + file:write(XML_STRING); + file:close(); + end