nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change. Move fax_queue to app/fax.

Browse Source
This commit is contained in:
Alexey Melnichuk
2015-11-28 11:40:54 +03:00
parent 96273e0bc3
commit 46aa5f8049
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/install/scripts/fax_queue/exec.lua → resources/install/scripts/app/fax/resources/scripts/queue/exec.lua
View File

@@ -1,7 +1,7 @@
-- @usage without queue -- @usage without queue
-- api: originate {fax_file='',wav_file='',fax_dtmf=''}user/108@domain.local &lua(fax_queue/exec.lua) -- api: originate {fax_file='',wav_file='',fax_dtmf=''}user/108@domain.local &lua(app/fax/resources/scripts/queue/exec.lua)
-- @usage with queue task -- @usage with queue task
-- api: originate {fax_task_uuid=''}user/108@domain.local &lua(fax_queue/exec.lua) -- api: originate {fax_task_uuid=''}user/108@domain.local &lua(app/fax/resources/scripts/queue/exec.lua)
-- @fax_dtmf -- @fax_dtmf
-- 0-9*# - dtmf symbols -- 0-9*# - dtmf symbols
-- @200 - dtmf duration in ms -- @200 - dtmf duration in ms
@@ -18,7 +18,7 @@ local log = require "resources.functions.log".fax_task
-- If we handle queue task -- If we handle queue task
local fax_task_uuid = session:getVariable('fax_task_uuid') local fax_task_uuid = session:getVariable('fax_task_uuid')
local task if fax_task_uuid then local task if fax_task_uuid then
local Tasks = require "fax_queue.tasks" local Tasks = require "app.fax.resources.scripts.queue.tasks"
task = Tasks.select_task(fax_task_uuid) task = Tasks.select_task(fax_task_uuid)
if not task then if not task then
log.warningf("Can not found fax task: %q", tostring(fax_task_uuid)) log.warningf("Can not found fax task: %q", tostring(fax_task_uuid))

6
resources/install/scripts/fax_queue/next.lua → resources/install/scripts/app/fax/resources/scripts/queue/next.lua
View File

@@ -2,7 +2,7 @@ require "resources.functions.config"
require "resources.functions.sleep" require "resources.functions.sleep"
local log = require "resources.functions.log".next_fax_task local log = require "resources.functions.log".next_fax_task
local Tasks = require "fax_queue.tasks" local Tasks = require "app.fax.resources.scripts.queue.tasks"
local Esl = require "resources.functions.esl" local Esl = require "resources.functions.esl"
local FAX_OPTIONS = { local FAX_OPTIONS = {
@@ -30,11 +30,11 @@ local function next_task()
local mode = (task.retry_counter % #FAX_OPTIONS) + 1 local mode = (task.retry_counter % #FAX_OPTIONS) + 1
local dial_string = '{' .. local dial_string = '{' ..
task.dial_string .. "api_hangup_hook='lua fax_queue/retry.lua'," .. task.dial_string .. "api_hangup_hook='lua app/fax/resources/scripts/queue/retry.lua'," ..
FAX_OPTIONS[mode] .. FAX_OPTIONS[mode] ..
'}' .. task.uri '}' .. task.uri
local originate = 'originate ' .. dial_string .. ' &lua(fax_queue/exec.lua)' local originate = 'originate ' .. dial_string .. ' &lua(app/fax/resources/scripts/queue/exec.lua)'
log.notice(originate) log.notice(originate)
esl = assert(Esl.new()) esl = assert(Esl.new())

2
resources/install/scripts/fax_queue/retry.lua → resources/install/scripts/app/fax/resources/scripts/queue/retry.lua
View File

@@ -7,7 +7,7 @@
local log = require "resources.functions.log".fax_retry local log = require "resources.functions.log".fax_retry
local Database = require "resources.functions.database" local Database = require "resources.functions.database"
local Settings = require "resources.functions.lazy_settings" local Settings = require "resources.functions.lazy_settings"
local Tasks = require "fax_queue.tasks" local Tasks = require "app.fax.resources.scripts.queue.tasks"
local fax_task_uuid = env:getHeader('fax_task_uuid') local fax_task_uuid = env:getHeader('fax_task_uuid')
local task = Tasks.select_task(fax_task_uuid) local task = Tasks.select_task(fax_task_uuid)

0
resources/install/scripts/fax_queue/tasks.lua → resources/install/scripts/app/fax/resources/scripts/queue/tasks.lua
View File

2
resources/install/scripts/fax_queue_monitor.lua
View File

@@ -9,7 +9,7 @@
require "resources.functions.sleep"; require "resources.functions.sleep";
local log = require "resources.functions.log".fax_queue_monitor local log = require "resources.functions.log".fax_queue_monitor
local Next = require "fax_queue.next" local Next = require "app.fax.resources.scripts.queue.next"
mkdir(scripts_dir .. "/run"); mkdir(scripts_dir .. "/run");

2
resources/install/scripts/fax_queue_poll_once.lua
View File

@@ -1 +1 @@
require "fax_queue.next".poll_once() require "app.fax.resources.scripts.queue.next".poll_once()