Change our_nodes() to include only active zones/domains also. Updates to heartbeat
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
Reference in New Issue
Block a user