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

Improve multi-server cluster support.

This commit is contained in:
FusionPBX 2022-07-07 16:14:01 -06:00 committed by GitHub
parent 5bc7083692
commit da181fc6f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/fax_queue/resources/service/fax_queue.php
View File

@ -88,12 +88,12 @@
} }
//make sure the /var/run/fusionpbx directory exists //make sure the /var/run/fusionpbx directory exists
if (!file_exists('/var/run/fusionpbx')) { if (!file_exists('/var/run/fusionpbx')) {
$result = mkdir('/var/run/fusionpbx', 0777, true); $result = mkdir('/var/run/fusionpbx', 0777, true);
if (!$result) { if (!$result) {
die('Failed to create /var/run/fusionpbx'); die('Failed to create /var/run/fusionpbx');
} }
} }
//create the process id file if the process doesn't exist //create the process id file if the process doesn't exist
if (!$pid_exists) { if (!$pid_exists) {
@ -145,17 +145,18 @@
//get the fax messages that are waiting to send //get the fax messages that are waiting to send
$sql = "select * from v_fax_queue "; $sql = "select * from v_fax_queue ";
$sql .= "where "; $sql .= "where hostname = :hostname ";
$sql .= "( "; $sql .= "and ( ";
$sql .= " (fax_status = 'waiting' or fax_status = 'trying') "; $sql .= " ( ";
$sql .= " and (fax_retry_date is null or floor(extract(epoch from now()) - extract(epoch from fax_retry_date)) > :retry_interval) "; $sql .= " (fax_status = 'waiting' or fax_status = 'trying') ";
$sql .= ") "; $sql .= " and (fax_retry_date is null or floor(extract(epoch from now()) - extract(epoch from fax_retry_date)) > :retry_interval) ";
$sql .= "or ( "; $sql .= " ) ";
$sql .= " fax_status = 'sent' "; $sql .= " or ( ";
$sql .= " and fax_email_address is not null "; $sql .= " fax_status = 'sent' ";
$sql .= " and fax_notify_date is null "; $sql .= " and fax_email_address is not null ";
$sql .= " and fax_notify_date is null ";
$sql .= " ) ";
$sql .= ") "; $sql .= ") ";
$sql .= "and hostname = :hostname ";
$sql .= "order by domain_uuid asc "; $sql .= "order by domain_uuid asc ";
$sql .= "limit :limit "; $sql .= "limit :limit ";
if (isset($hostname)) { if (isset($hostname)) {
@ -167,12 +168,13 @@
$parameters['limit'] = $fax_queue_limit; $parameters['limit'] = $fax_queue_limit;
$parameters['retry_interval'] = $fax_retry_interval; $parameters['retry_interval'] = $fax_retry_interval;
if (isset($debug_sql)) { if (isset($debug_sql)) {
echo $sql."\n";
print_r($parameters); print_r($parameters);
} }
$database = new database; $database = new database;
$fax_queue = $database->select($sql, $parameters, 'all'); $fax_queue = $database->select($sql, $parameters, 'all');
unset($parameters); unset($parameters);
//show results from the database //show results from the database
if (isset($debug_sql)) { if (isset($debug_sql)) {
echo $sql."\n"; echo $sql."\n";