bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fix nodelist segment being sent from queue where gethostname() is only a container name, added ability to control filename when sending nodelist segment
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 38s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m38s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 9s
Details

Browse Source
This commit is contained in:
Deon George
2025-03-18 17:18:28 +11:00
parent 3797f3c7c5
commit 2458ca2408
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers.php
View File

@@ -141,22 +141,23 @@ function our_address(Domain|Address $o=NULL): Collection|Address|NULL
function our_hostname(Address $o): string
{
$our = our_address($o->domain)->first();
$ourhostname = $our->system->address;
switch ($our->role_id) {
case Address::NODE_ZC:
$domain = collect(explode('.',gethostname()))->forget(0)
$domain = collect(explode('.',$ourhostname))->forget(0)
->prepend(sprintf('z%d',$our->zone->zone_id));
break;
case Address::NODE_RC:
case Address::NODE_NC:
$domain = collect(explode('.',gethostname()))->forget(0)
$domain = collect(explode('.',$ourhostname))->forget(0)
->prepend(sprintf('z%d',$our->zone->zone_id))
->prepend(sprintf('n%d',$our->host_id));
break;
case Address::NODE_HC:
$domain = collect(explode('.',gethostname()))->forget(0)
$domain = collect(explode('.',$ourhostname))->forget(0)
->prepend(sprintf('z%d',$our->zone->zone_id))
->prepend(sprintf('n%d',$our->host_id))
->prepend(sprintf('f%d',$our->node_id));