Merge pull request #1264 from moteus/fax_queue

Change. Move fax_queue to app/fax.

resources/install/scripts/app/fax/resources/scripts/queue/exec.lua

@@ -1,7 +1,7 @@
 -- @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
--- 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
 --  0-9*# - dtmf symbols
 --  @200  - dtmf duration in ms
@@ -18,7 +18,7 @@ local log = require "resources.functions.log".fax_task
 -- If we handle queue task
 local fax_task_uuid  = session:getVariable('fax_task_uuid')
 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)
   if not task then
     log.warningf("Can not found fax task: %q", tostring(fax_task_uuid))

resources/install/scripts/app/fax/resources/scripts/queue/next.lua

@@ -2,7 +2,7 @@ require "resources.functions.config"
 
 require "resources.functions.sleep"
 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 FAX_OPTIONS = {
@@ -30,11 +30,11 @@ local function next_task()
 
     local mode = (task.retry_counter % #FAX_OPTIONS) + 1
     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] .. 
     '}' .. 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)
     esl = assert(Esl.new())

resources/install/scripts/app/fax/resources/scripts/queue/retry.lua

@@ -7,7 +7,7 @@
 	local log      = require "resources.functions.log".fax_retry
 	local Database = require "resources.functions.database"
 	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 task           = Tasks.select_task(fax_task_uuid)

resources/install/scripts/fax_queue_monitor.lua

@@ -9,7 +9,7 @@
 	require "resources.functions.sleep";
 
 	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");
 

resources/install/scripts/fax_queue_poll_once.lua

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