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

Event socket bug fix and more docs (#6823)

Browse Source 
* Add documentation to methods. Use is_resource for added type detection

* Allow connect to specify timeout in microseconds with default 30,000

* Update calling mechanism for event sockets

* Update project for new singleton event sockets

* remove unused variable

* catch errors on closing the socket
This commit is contained in:
frytimo
2023-12-02 20:16:18 -04:00
committed by GitHub
parent 44567f7a05
commit 3a4c2f72e2
74 changed files with 1620 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/modules/modules.php
View File

@@ -92,17 +92,10 @@
}
//connect to event socket
$fp = event_socket_create();
//check connection status
$esl_alive = false;
if ($fp) {
$esl_alive = true;
fclose($fp);
}
$esl = event_socket::create();
//warn if switch not running
if (!$fp) {
if (!$esl->is_connected()) {
message::add($text['error-event-socket'], 'negative', 5000);
}
@@ -133,7 +126,7 @@
echo "<div class='action_bar' id='action_bar'>\n";
echo " <div class='heading'><b>".$text['header-modules']." (".$module_count.")</b></div>\n";
echo " <div class='actions'>\n";
if (permission_exists('module_edit') && $modules && $fp) {
if (permission_exists('module_edit') && $modules && $esl->is_connected()) {
echo button::create(['type'=>'button','label'=>$text['button-stop'],'icon'=>$_SESSION['theme']['button_icon_stop'],'onclick'=>"modal_open('modal-stop','btn_stop');"]);
echo button::create(['type'=>'button','label'=>$text['button-start'],'icon'=>$_SESSION['theme']['button_icon_start'],'onclick'=>"modal_open('modal-start','btn_start');"]);
}
@@ -151,7 +144,7 @@
echo " <div style='clear: both;'></div>\n";
echo "</div>\n";
if (permission_exists('module_edit') && !empty($modules) && $fp) {
if (permission_exists('module_edit') && !empty($modules) && $esl->is_connected()) {
echo modal::create(['id'=>'modal-stop','type'=>'general','message'=>$text['confirm-stop_modules'],'actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_stop','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('stop'); list_form_submit('form_list');"])]);
echo modal::create(['id'=>'modal-start','type'=>'general','message'=>$text['confirm-start_modules'],'actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_start','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('start'); list_form_submit('form_list');"])]);
}
@@ -171,7 +164,7 @@
echo "<table class='list'>\n";
function write_header($modifier) {
global $fp, $text, $modules, $list_row_edit_button;
global $text, $modules, $list_row_edit_button;
$modifier = str_replace('/', '', $modifier);
$modifier = str_replace(' ', ' ', $modifier);
$modifier = str_replace(' ', '_', $modifier);
@@ -185,7 +178,8 @@
}
echo "<th>".$text['label-label']."</th>\n";
echo "<th class='hide-xs'>".$text['label-status']."</th>\n";
if ($fp) {
$esl = event_socket::create();
if ($esl->is_connected()) {
echo "<th class='center'>".$text['label-action']."</th>\n";
}
echo "<th class='center'>".$text['label-enabled']."</th>\n";
@@ -229,7 +223,7 @@
echo escape($row['module_label']);
}
echo " </td>\n";
if ($fp) {
if ($esl->is_connected()) {
if ($module->active($row["module_name"])) {
echo " <td class='hide-xs'>".$text['label-running']."</td>\n";
if (permission_exists('module_edit')) {

29
app/modules/resources/classes/modules.php
View File

@@ -32,7 +32,7 @@ if (!class_exists('modules')) {
* declare public variables
*/
public $dir;
public $fp;
public $esl;
public $modules;
public $msg;
@@ -65,9 +65,8 @@ if (!class_exists('modules')) {
$this->toggle_values = ['true','false'];
//get the list of active modules
$this->fp = event_socket_create();
$cmd = "api show modules as json";
$json = event_socket_request($this->fp, $cmd);
$this->esl = event_socket::create();
$json = $this->esl->api("show modules as json");
$this->active_modules = json_decode($json, true);
}
@@ -884,15 +883,14 @@ if (!class_exists('modules')) {
if (is_array($modules) && @sizeof($modules) != 0) {
//create the event socket connection
$fp = event_socket_create();
$esl = event_socket::create();
if ($fp) {
if ($esl->is_connected()) {
//control modules
foreach ($modules as $module_uuid => $module) {
if ($module['enabled'] == 'true') {
$cmd = 'api '.$action.' '.$module['name'];
$responses[$module_uuid]['module'] = $module['name'];
$responses[$module_uuid]['message'] = trim(event_socket_request($fp, $cmd));
$responses[$module_uuid]['message'] = trim(event_socket::api($action.' '.$module['name']));
}
else {
$responses[$module_uuid]['module'] = $module['name'];
@@ -970,15 +968,14 @@ if (!class_exists('modules')) {
if (is_array($array) && @sizeof($array) != 0) {
//create the event socket connection
$fp = event_socket_create();
$esl = event_socket::create();
//stop modules
if ($fp) {
if ($esl->is_connected()) {
foreach ($modules as $module_uuid => $module) {
if ($this->active($module['name'])) {
$cmd = 'api unload '.$module['name'];
$responses[$module_uuid]['module'] = $module['name'];
$responses[$module_uuid]['message'] = trim(event_socket_request($fp, $cmd));
$responses[$module_uuid]['message'] = trim(event_socket::api('unload '.$module['name']));
}
}
}
@@ -1070,15 +1067,15 @@ if (!class_exists('modules')) {
unset($array);
//create the event socket connection
$fp = event_socket_create();
$esl = event_socket::create();
//stop modules if active
if ($fp) {
if ($esl->is_connected()) {
foreach ($modules as $module_uuid => $module) {
if ($this->active($module['name'])) {
$cmd = 'api unload '.$module['name'];
$cmd = 'unload '.$module['name'];
$responses[$module_uuid]['module'] = $module['name'];
$responses[$module_uuid]['message'] = trim(event_socket_request($fp, $cmd));
$responses[$module_uuid]['message'] = trim(event_socket::api($cmd));
}
}
}