From d38aa31031268fae3154be7053dc7000bdcf5e9f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 11 Jan 2018 12:07:40 -0700 Subject: [PATCH] Update local_stream.conf.lua --- .../configuration/local_stream.conf.lua | 217 +++++++++++------- 1 file changed, 131 insertions(+), 86 deletions(-) diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua index bcc19b3ca7..c65257ba50 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua @@ -1,101 +1,146 @@ ---connect to the database - local Database = require "resources.functions.database"; - dbh = Database.new('system'); +--get the cache + local cache = require "resources.functions.cache" + local local_stream_cache_key = "configuration:local_stream.conf" + XML_STRING, err = cache.get(local_stream_cache_key) ---exits the script if we didn't connect properly - assert(dbh:connected()); +--set the cache + if not XML_STRING then ---start the xml array - local xml = {} - table.insert(xml, [[]]); - table.insert(xml, [[]]); - table.insert(xml, [[
]]); - table.insert(xml, [[ ]]); + --log the cache error + if (debug["cache"]) then + freeswitch.consoleLog("warning", "[xml_handler] configuration:local_stream.conf can not be get from cache: " .. tostring(err) .. "\n"); + end ---run the query - sql = "select d.domain_name, s.* " - sql = sql .. "from v_music_on_hold as s left outer join v_domains as d " - sql = sql .. "on d.domain_uuid = s.domain_uuid " - sql = sql .. "order by s.music_on_hold_name asc " - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "\n"); - end - x = 0; - dbh:query(sql, function(row) + --set a default value + if (expire["default"] == nil) then + expire["default"]= "3600"; + end - --combine the name, domain_name and the rate - name = ''; - if (row.domain_uuid ~= nil and string.len(row.domain_uuid) > 0) then - name = row.domain_name..'/'; - end - name = name .. row.music_on_hold_name; - if (row.music_on_hold_rate ~= nil and #row.music_on_hold_rate > 0) then - name = name .. '/' .. row.music_on_hold_rate; - end + --connect to the database + local Database = require "resources.functions.database"; + dbh = Database.new('system'); - --replace the variable with the path to the sounds directory - music_on_hold_path = row.music_on_hold_path:gsub("$${sounds_dir}", sounds_dir); + --include json library + local json + if (debug["sql"]) then + json = require "resources.functions.lunajson" + end - --set the rate - rate = row.music_on_hold_rate; - if rate == '' then - rate = '48000'; - end + --exits the script if we didn't connect properly + assert(dbh:connected()); - --add the full path to the chime list - chime_list = row.music_on_hold_chime_list; - if (chime_list ~= nil) then - chime_array = explode(",", chime_list); - chime_list = ""; - for k,v in pairs(chime_array) do - f = explode("/", v); - if (f[1] ~= nil and f[2] ~= nil and file_exists(sounds_dir.."/en/us/callie/"..f[1].."/"..rate.."/"..f[2])) then - chime_list = chime_list .. sounds_dir.."/en/us/callie/"..v; + --start the xml array + local xml = {} + table.insert(xml, [[]]); + table.insert(xml, [[]]); + table.insert(xml, [[
]]); + table.insert(xml, [[ ]]); + + --run the query + sql = "select d.domain_name, s.* " + sql = sql .. "from v_music_on_hold as s left outer join v_domains as d " + sql = sql .. "on d.domain_uuid = s.domain_uuid " + sql = sql .. "order by s.music_on_hold_name asc " + if (debug["sql"]) then + freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "\n"); + end + x = 0; + dbh:query(sql, function(row) + + --combine the name, domain_name and the rate + name = ''; + if (row.domain_uuid ~= nil and string.len(row.domain_uuid) > 0) then + name = row.domain_name..'/'; + end + name = name .. row.music_on_hold_name; + if (row.music_on_hold_rate ~= nil and #row.music_on_hold_rate > 0) then + name = name .. '/' .. row.music_on_hold_rate; + end + + --replace the variable with the path to the sounds directory + music_on_hold_path = row.music_on_hold_path:gsub("$${sounds_dir}", sounds_dir); + + --set the rate + rate = row.music_on_hold_rate; + if rate == '' then + rate = '48000'; + end + + --add the full path to the chime list + chime_list = row.music_on_hold_chime_list; + if (chime_list ~= nil) then + chime_array = explode(",", chime_list); + chime_list = ""; + for k,v in pairs(chime_array) do + f = explode("/", v); + if (f[1] ~= nil and f[2] ~= nil and file_exists(sounds_dir.."/en/us/callie/"..f[1].."/"..rate.."/"..f[2])) then + chime_list = chime_list .. sounds_dir.."/en/us/callie/"..v; + else + chime_list = chime_list .. v; + end + end + end + + --set the default timer name to soft + if (row.music_on_hold_timer_name == nil or row.music_on_hold_timer_name == '') then + timer_name = "soft"; else - chime_list = chime_list .. v; + timer_name = row.music_on_hold_timer_name; + end + + --build the xml ]]..row.music_on_hold_name..[[" + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + if (chime_list ~= nil) then + table.insert(xml, [[ ]]); + end + if (row.music_on_hold_chime_freq ~= nil) then + table.insert(xml, [[ ]]); + end + if (row.music_on_hold_chime_max ~= nil) then + table.insert(xml, [[ ]]); + end + table.insert(xml, [[ ]]); + + end) + + --close the extension tag if it was left open + table.insert(xml, [[ ]]); + table.insert(xml, [[
]]); + table.insert(xml, [[]]); + XML_STRING = table.concat(xml, "\n"); + if (debug["xml_string"]) then + freeswitch.consoleLog("notice", "[xml_handler] XML_STRING: " .. XML_STRING .. "\n"); + end + + --close the database connection + dbh:release(); + + --set the cache + local ok, err = cache.set(local_stream_cache_key, XML_STRING, expire["default"]); + if debug["cache"] then + if ok then + freeswitch.consoleLog("notice", "[xml_handler] " .. local_stream_cache_key .. " stored in the cache\n"); + else + freeswitch.consoleLog("warning", "[xml_handler] " .. local_stream_cache_key .. " can not be stored in the cache: " .. tostring(err) .. "\n"); end end - end - --set the default timer name to soft - if (row.music_on_hold_timer_name == nil or row.music_on_hold_timer_name == '') then - timer_name = "soft"; - else - timer_name = row.music_on_hold_timer_name; - end - - --build the xml ]]..row.music_on_hold_name..[[" - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - if (chime_list ~= nil) then - table.insert(xml, [[ ]]); - end - if (row.music_on_hold_chime_freq ~= nil) then - table.insert(xml, [[ ]]); - end - if (row.music_on_hold_chime_max ~= nil) then - table.insert(xml, [[ ]]); - end - table.insert(xml, [[ ]]); - - end) - ---close the extension tag if it was left open - table.insert(xml, [[ ]]); - table.insert(xml, [[
]]); - table.insert(xml, [[]]); - XML_STRING = table.concat(xml, "\n"); - if (debug["xml_string"]) then - freeswitch.consoleLog("notice", "[xml_handler] XML_STRING: " .. XML_STRING .. "\n"); - end - ---close the database connection - dbh:release(); + --send to the console + if (debug["cache"]) then + freeswitch.consoleLog("notice", "[xml_handler] " .. local_stream_cache_key .. " source: database\n"); + end + else + --send to the console + if (debug["cache"]) then + freeswitch.consoleLog("notice", "[xml_handler] " .. local_stream_cache_key .. " source: cache\n"); + end + end --if XML_STRING --send the xml to the console if (debug["xml_string"]) then