Change our_nodes() to include only active zones/domains also. Updates to heartbeat
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 39s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m35s
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s

This commit is contained in:
2024-12-09 12:03:38 +11:00
parent ae44732848
commit aa55d05ccb
3 changed files with 9 additions and 34 deletions

View File

@@ -179,11 +179,12 @@ function our_nodes(Domain $do=NULL): Collection
{
return Address::select(['addresses.id','addresses.zone_id','region_id','host_id','node_id','point_id','addresses.system_id','role'])
->join('system_zone',['system_zone.system_id'=>'addresses.system_id','system_zone.zone_id'=>'addresses.zone_id'])
->join('zones',['zones.id'=>'system_zone.zone_id'])
->join('domains',['domains.id'=>'zones.domain_id'])
->when(! is_null($do),
fn($query)=>$query
->join('zones',['zones.id'=>'addresses.zone_id'])
->where('domain_id',$do->id))
->active()
->ActiveFTN()
->FTNorder()
->get();
}