nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

When hostname is used in the cache key use it as a prefix

Browse Source
This commit is contained in:
FusionPBX
2025-10-15 20:02:46 -06:00
committed by GitHub
parent d6ac324819
commit 4777d8b928
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/switch/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
View File

@@ -50,8 +50,8 @@
--get the cache
local cache = require "resources.functions.cache"
hostname = trim(api:execute("switchname", ""));
local cc_cache_key = "configuration:callcenter.conf:" .. hostname
hostname = trim(api:execute("hostname", ""));
local cc_cache_key = hostname .. ":configuration:callcenter.conf";
XML_STRING, err = cache.get(cc_cache_key)
--set the cache

4
app/switch/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
View File

@@ -29,8 +29,8 @@
--get the cache
local cache = require "resources.functions.cache"
local hostname = trim(api:execute("switchname", ""))
local sofia_cache_key = "configuration:sofia.conf:" .. hostname
local hostname = trim(api:execute("hostname", ""))
local sofia_cache_key = hostname .. ":configuration:sofia.conf";
XML_STRING, err = cache.get(sofia_cache_key)
--set the cache

19
app/switch/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
View File

@@ -153,18 +153,22 @@
-- cleanup
XML_STRING = nil;
--get the caller hostname
hostname = trim(api:execute("hostname", ""));
--freeswitch.consoleLog("notice", "[xml_handler][directory] hostname is " .. hostname .. "\n");
-- get the cache. We can use cache only if we do not use `fs_path`
-- or we do not need dial-string. In other way we have to use database.
if (continue) and (not USE_FS_PATH) then
if (cache.support() and domain_name) then
local key, err = "directory:" .. (from_user or user) .. "@" .. domain_name
XML_STRING, err = cache.get(key);
local cache_key, err = hostname .. ":directory:" .. (from_user or user) .. "@" .. domain_name
XML_STRING, err = cache.get(cache_key);
if debug['cache'] then
if not XML_STRING then
freeswitch.consoleLog("notice", "[xml_handler][directory][cache] get key: " .. key .. " fail: " .. tostring(err) .. "\n")
freeswitch.consoleLog("notice", "[xml_handler][directory][cache] get key: " .. cache_key .. " fail: " .. tostring(err) .. "\n")
else
freeswitch.consoleLog("notice", "[xml_handler][directory][cache] get key: " .. key .. " pass!" .. "\n")
freeswitch.consoleLog("notice", "[xml_handler][directory][cache] get key: " .. cache_key .. " pass!" .. "\n")
end
end
end
@@ -236,9 +240,6 @@
end);
end
--get the caller hostname
local_hostname = trim(api:execute("switchname", ""));
--freeswitch.consoleLog("notice", "[xml_handler][directory] local_hostname is " .. local_hostname .. "\n");
--add the file_exists function
require "resources.functions.file_exists";
@@ -464,7 +465,7 @@
end
--set an alternative dial string if the hostnames don't match
if (USE_FS_PATH) then
if (local_hostname == database_hostname) then
if (hostname == database_hostname) then
freeswitch.consoleLog("notice", "[xml_handler][directory] local_host and database_host are the same\n");
else
contact = trim(api:execute("sofia_contact", destination));
@@ -482,7 +483,7 @@
--show debug information
if (USE_FS_PATH) then
freeswitch.consoleLog("notice", "[xml_handler] local_hostname: " .. local_hostname.. " database_hostname: " .. database_hostname .. " dial_string: " .. dial_string .. "\n");
freeswitch.consoleLog("notice", "[xml_handler] local_hostname: " .. hostname.. " database_hostname: " .. database_hostname .. " dial_string: " .. dial_string .. "\n");
end
end
end);