WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

user_server_name

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2024-10-02 14:16:31 -04:00
parent 5e56b3688b
commit be14c3ae2b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www-api/app/Controllers/BaseController.php
+7 -4
View File
@@ -46,6 +46,8 @@ abstract class BaseController extends Controller
public $server_tag=''; public $server_tag='';
public $wrenchboard=null; public $wrenchboard=null;
public $micro_service_net1; public $micro_service_net1;
public $user_server_name ='';
/** /**
* Constructor. * Constructor.
*/ */
@@ -63,6 +65,7 @@ abstract class BaseController extends Controller
$this->primary_image_sever = $this->getSiteConfigurations("system.primary_image_sever"); $this->primary_image_sever = $this->getSiteConfigurations("system.primary_image_sever");
$this->server_tag = $this->getSiteConfigurations("system.server_tag"); $this->server_tag = $this->getSiteConfigurations("system.server_tag");
$this->micro_service_net1 = $this->getSiteConfigurations("system.micro_service_net1"); //"10.10.1 $this->micro_service_net1 = $this->getSiteConfigurations("system.micro_service_net1"); //"10.10.1
$this->user_server_name = $this->getSiteConfigurations("system.server_name"); // 'https://dev-users.wrenchboard.com';
//$this->cache_server = $this->getSiteConfigurations("system.cache_host"); //$this->cache_server = $this->getSiteConfigurations("system.cache_host");
// $redis = [ // $redis = [
@@ -487,8 +490,8 @@ wrenchboard=#
]; ];
} }
public function summaryReturnData($in,$outResult, $extraOut=[]){ public function summaryReturnData($in,$outResult, $extraOut=[]){
log_message('critical', "summaryReturnData:: ********* IN ".serialize($in) ); // log_message('critical', "summaryReturnData:: ********* IN ".serialize($in) );
log_message('critical', "summaryReturnData:: ********* OUT ".serialize($outResult) ); // log_message('critical', "summaryReturnData:: ********* OUT ".serialize($outResult) );
if ($in["action"] == -1 ){ if ($in["action"] == -1 ){
$final_out = $outResult; $final_out = $outResult;
} }
@@ -503,7 +506,7 @@ wrenchboard=#
if( isset( $extraOut['activetaskslist'])){ if( isset( $extraOut['activetaskslist'])){
$final_out["active_tasks_list"] = $extraOut['activetaskslist']; $final_out["active_tasks_list"] = $extraOut['activetaskslist'];
} }
$final_out['user_server_name'] = $this->user_server_name;
$final_out["environment"] = $this->current_env + 0; $final_out["environment"] = $this->current_env + 0;
$final_out["session_image_server"] = $this->primary_image_sever; $final_out["session_image_server"] = $this->primary_image_sever;
$final_out["server_tag"] = $this->server_tag; $final_out["server_tag"] = $this->server_tag;
@@ -514,7 +517,7 @@ wrenchboard=#
$final_out["history_types"] = $this->historyTypes(); $final_out["history_types"] = $this->historyTypes();
$final_out["generative_types"] = $this->generativeTypes(); $final_out["generative_types"] = $this->generativeTypes();
$final_out["refer_link"] = "https://www.wrenchboard.com"; $final_out["refer_link"] = "https://www.wrenchboard.com";
log_message('critical', "summaryReturnData:: ********* FINAL OUT ".serialize($final_out) ); // log_message('critical', "summaryReturnData:: ********* FINAL OUT ".serialize($final_out) );
return json_encode( $final_out ); return json_encode( $final_out );
} }