dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add [find_file.lua] to the logging and show file that wasn't found.

Browse Source
This commit is contained in:
FusionPBX
2021-07-08 12:41:22 -06:00
committed by GitHub
parent dd26e357e0
commit d9be32d422
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/scripts/resources/scripts/resources/functions/find_file.lua
+10 -6
View File
@@ -8,7 +8,7 @@ local is_absolute_path = require "resources.functions.is_absolute_path"
function find_file(dbh, domain_name, domain_uuid, file_name) function find_file(dbh, domain_name, domain_uuid, file_name)
-- if we specify e.g. full path -- if we specify e.g. full path
if (is_absolute_path(file_name) and file.exists(file_name)) then if (is_absolute_path(file_name) and file.exists(file_name)) then
log.debugf('found file `%s` in file system', file_name) log.debugf('[find_file.lua] found file `%s` in file system', file_name)
return file_name return file_name
end end
@@ -18,9 +18,13 @@ function find_file(dbh, domain_name, domain_uuid, file_name)
if file_name_only == file_name then -- this can be recordings if file_name_only == file_name then -- this can be recordings
local full_path = recordings_dir .. "/" .. domain_name .. "/" .. file_name local full_path = recordings_dir .. "/" .. domain_name .. "/" .. file_name
if file.exists(full_path) then if file.exists(full_path) then
log.debugf('resolve `%s` as recording `%s`', file_name, full_path) log.debugf('[find_file.lua] `%s` as recording `%s`', file_name, full_path)
file_name, found = full_path, true file_name, found = full_path, true
else -- recordings may be in database else
--send debug info to the log
log.debugf('[find_file.lua] `%s` as recording `%s`', file_name, full_path)
-- recordings may be in database
local settings = Settings.new(dbh, domain_name, domain_uuid) local settings = Settings.new(dbh, domain_name, domain_uuid)
local storage_type = settings:get('recordings', 'storage_type', 'text') or '' local storage_type = settings:get('recordings', 'storage_type', 'text') or ''
if storage_type == 'base64' then if storage_type == 'base64' then
@@ -37,7 +41,7 @@ function find_file(dbh, domain_name, domain_uuid, file_name)
dbh:release(); dbh:release();
if recording_base64 and #recording_base64 > 32 then if recording_base64 and #recording_base64 > 32 then
log.debugf('resolve `%s` as recording `%s`(base64)', file_name, full_path) log.debugf('[find_file.lua] `%s` as recording `%s`(base64)', file_name, full_path)
file_name, found, is_base64 = full_path, true, true file_name, found, is_base64 = full_path, true, true
file.write_base64(file_name, recording_base64) file.write_base64(file_name, recording_base64)
end end
@@ -65,7 +69,7 @@ function find_file(dbh, domain_name, domain_uuid, file_name)
if sounds_dir then if sounds_dir then
found = file.exists(sounds_dir.. "/" ..file_name_only) found = file.exists(sounds_dir.. "/" ..file_name_only)
if found then if found then
log.debugf('resolve `%s` as sound `%s`', file_name, found) log.debugf('[find_file.lua] `%s` as sound `%s`', file_name, found)
file_name, found = found, true file_name, found = found, true
end end
end end
@@ -78,4 +82,4 @@ function find_file(dbh, domain_name, domain_uuid, file_name)
return file_name, is_base64 return file_name, is_base64
end end
return find_file return find_file