More work on finding idle nodes
This commit is contained in:
parent
4501443a43
commit
333e7e773d
@ -49,127 +49,151 @@ class AddressIdle implements ShouldQueue
|
|||||||
$result = collect();
|
$result = collect();
|
||||||
|
|
||||||
// Delist DOWN nodes
|
// Delist DOWN nodes
|
||||||
foreach ($this->old($this->do,config('fido.idle.delist'),Address::NODE_DOWN,$this->ao) as $ao) {
|
if (config('fido.idle.delist')) {
|
||||||
// Only delist system that has been marked down
|
$age = Carbon::now()->subDays(config('fido.idle.delist'));
|
||||||
// Only delist them if its been 14 days since they were marked DOWN
|
|
||||||
if ((! $ao->is_down) || ($ao->updated_at->greaterThan(Carbon::now()->subWeeks(2))))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
Log::info(sprintf('%s:- Delisting [%s], not seen for [%d] days',self::LOGKEY,$ao->ftn,config('fido.idle.delist')));
|
foreach ($this->old($this->do,config('fido.idle.delist'),Address::NODE_DOWN,$this->ao) as $ao) {
|
||||||
$contact = FALSE;
|
// Only delist system that has been marked down
|
||||||
|
// Only delist them if its been 14 days since they were marked DOWN
|
||||||
|
if ((! $ao->is_down) || ($ao->updated_at->greaterThan(Carbon::now()->subWeeks(2))))
|
||||||
|
continue;
|
||||||
|
|
||||||
// Remove echomail not collected from echomail_seenby
|
// Validate that the last seen was infact that long ago
|
||||||
DB::table('echomail_seenby')
|
if ($ao->system->last_seen->greaterThan($age))
|
||||||
->where('address_id',$ao->id)
|
continue;
|
||||||
->whereNotNull('export_at')
|
|
||||||
->whereNull('sent_at')
|
|
||||||
->delete();
|
|
||||||
|
|
||||||
// Remove FLAG_INTRANSIT from netmail that hasnt been delivered
|
Log::info(sprintf('%s:- Delisting [%s], not seen for [%d] days',self::LOGKEY,$ao->ftn,config('fido.idle.delist')));
|
||||||
DB::table('netmails')
|
$contact = FALSE;
|
||||||
->where('tftn_id',$ao->id)
|
|
||||||
->whereRaw(sprintf('(flags & %d) > 0',Message::FLAG_INTRANSIT))
|
|
||||||
->update(['flags'=>DB::raw(sprintf('(flags & ~%d)',Message::FLAG_INTRANSIT))]);
|
|
||||||
|
|
||||||
// Remove files not collected
|
// Remove echomail not collected from echomail_seenby
|
||||||
DB::table('file_seenby')
|
DB::table('echomail_seenby')
|
||||||
->where('address_id',$ao->id)
|
->where('address_id',$ao->id)
|
||||||
->whereNotNull('export_at')
|
->whereNotNull('export_at')
|
||||||
->whereNull('sent_at')
|
->whereNull('sent_at')
|
||||||
->delete();
|
->delete();
|
||||||
|
|
||||||
// Remove subscribed echoareas
|
// Remove FLAG_INTRANSIT from netmail that hasnt been delivered
|
||||||
$ao->echoareas()->detach();
|
DB::table('netmails')
|
||||||
|
->where('tftn_id',$ao->id)
|
||||||
|
->whereRaw(sprintf('(flags & %d) > 0',Message::FLAG_INTRANSIT))
|
||||||
|
->update(['flags'=>DB::raw(sprintf('(flags & ~%d)',Message::FLAG_INTRANSIT))]);
|
||||||
|
|
||||||
// Remove subscribed fileareas
|
// Remove files not collected
|
||||||
$ao->fileareas()->detach();
|
DB::table('file_seenby')
|
||||||
|
->where('address_id',$ao->id)
|
||||||
|
->whereNotNull('export_at')
|
||||||
|
->whereNull('sent_at')
|
||||||
|
->delete();
|
||||||
|
|
||||||
$ao->active = FALSE;
|
// Remove subscribed echoareas
|
||||||
$ao->validated = FALSE;
|
$ao->echoareas()->detach();
|
||||||
$ao->save();
|
|
||||||
|
|
||||||
// Email Alert
|
// Remove subscribed fileareas
|
||||||
if ($ao->system->users->count()) {
|
$ao->fileareas()->detach();
|
||||||
Notification::send($ao->system->users,new NodeDelistedEmail($ao->withoutRelations()));
|
|
||||||
$contact = TRUE;
|
$ao->active = FALSE;
|
||||||
|
$ao->validated = FALSE;
|
||||||
|
$ao->save();
|
||||||
|
|
||||||
|
// Email Alert
|
||||||
|
if ($ao->system->users->count()) {
|
||||||
|
Notification::send($ao->system->users,new NodeDelistedEmail($ao->withoutRelations()));
|
||||||
|
$contact = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Netmail Alert (to othernet network address)
|
||||||
|
if ($ao->system->uncommon()->count()) {
|
||||||
|
Notification::route('netmail',$ao->system->uncommon()->first()->withoutRelations())->notify(new NodeDelistedNetmail($ao->withoutRelations()));
|
||||||
|
$contact = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
$ao->contacted = $contact;
|
||||||
|
$result->push($ao);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Netmail Alert (to othernet network address)
|
|
||||||
if ($ao->system->uncommon()->count()) {
|
|
||||||
Notification::route('netmail',$ao->system->uncommon()->first()->withoutRelations())->notify(new NodeDelistedNetmail($ao->withoutRelations()));
|
|
||||||
$contact = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
$ao->contacted = $contact;
|
|
||||||
$result->push($ao);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mark nodes DOWN
|
// Mark nodes DOWN
|
||||||
foreach ($this->old($this->do,config('fido.idle.down'),Address::NODE_HOLD,$this->ao) as $ao) {
|
if (config('fido.idle.down')) {
|
||||||
// Only mark down system that has been marked down
|
$age = Carbon::now()->subDays(config('fido.idle.down'));
|
||||||
// Only mark down them if its been 14 days since they were marked HOLD
|
|
||||||
if ((! $ao->is_hold) || ($ao->updated_at->greaterThan(Carbon::now()->subWeeks(2))))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
Log::info(sprintf('%s:- Marking [%s] as DOWN, not seen for [%d] days',self::LOGKEY,$ao->ftn,config('fido.idle.down')));
|
foreach ($this->old($this->do,config('fido.idle.down'),Address::NODE_HOLD,$this->ao) as $ao) {
|
||||||
$contact = FALSE;
|
// Only mark down system that has been marked down
|
||||||
|
// Only mark down them if its been 14 days since they were marked HOLD
|
||||||
|
if ((! $ao->is_hold) || ($ao->updated_at->greaterThan(Carbon::now()->subWeeks(2))))
|
||||||
|
continue;
|
||||||
|
|
||||||
// Email Alert
|
// Validate that the last seen was infact that long ago
|
||||||
if ($ao->system->users->count()) {
|
if ($ao->system->last_seen->greaterThan($age))
|
||||||
Notification::send($ao->system->users,new NodeMarkedDownEmail($ao->withoutRelations()));
|
continue;
|
||||||
$contact = TRUE;
|
|
||||||
|
Log::info(sprintf('%s:- Marking [%s] as DOWN, not seen for [%d] days',self::LOGKEY,$ao->ftn,config('fido.idle.down')));
|
||||||
|
$contact = FALSE;
|
||||||
|
|
||||||
|
// Email Alert
|
||||||
|
if ($ao->system->users->count()) {
|
||||||
|
Notification::send($ao->system->users,new NodeMarkedDownEmail($ao->withoutRelations()));
|
||||||
|
$contact = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Netmail Alert (to othernet network address)
|
||||||
|
if ($ao->system->uncommon()->count()) {
|
||||||
|
Notification::route('netmail',$ao->system->uncommon()->first()->withoutRelations())->notify(new NodeMarkedDownNetmail($ao->withoutRelations()));
|
||||||
|
$contact = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mark as DOWN
|
||||||
|
$ao->role &= ~Address::NODE_HOLD;
|
||||||
|
$ao->role |= Address::NODE_DOWN;
|
||||||
|
$ao->save();
|
||||||
|
|
||||||
|
$ao->contacted = $contact;
|
||||||
|
$result->push($ao);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Netmail Alert (to othernet network address)
|
|
||||||
if ($ao->system->uncommon()->count()) {
|
|
||||||
Notification::route('netmail',$ao->system->uncommon()->first()->withoutRelations())->notify(new NodeMarkedDownNetmail($ao->withoutRelations()));
|
|
||||||
$contact = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mark as DOWN
|
|
||||||
$ao->role &= ~Address::NODE_HOLD;
|
|
||||||
$ao->role |= Address::NODE_DOWN;
|
|
||||||
$ao->save();
|
|
||||||
|
|
||||||
$ao->contacted = $contact;
|
|
||||||
$result->push($ao);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// @todo Make sure we only process addresses that we are responsible for, eg: 1/999 shouldnt have been processed even though 3/999 as eligible (and they are were connected to the same system)
|
// @todo Make sure we only process addresses that we are responsible for, eg: 1/999 shouldnt have been processed even though 3/999 as eligible (and they are were connected to the same system)
|
||||||
// Mark nodes as HOLD
|
// Mark nodes as HOLD
|
||||||
foreach ($this->old($this->do,config('fido.idle.hold'),Address::NODE_ALL,$this->ao) as $ao) {
|
if (config('fido.idle.hold')) {
|
||||||
// Ignore any systems that are a Discoverd System
|
$age = Carbon::now()->subDays(config('fido.idle.hold'));
|
||||||
if ($ao->system->name === System::default) {
|
|
||||||
Log::alert(sprintf('%s:! Ignoring HOLD for discovered System [%s]',self::LOGKEY,$ao->ftn));
|
foreach ($this->old($this->do,config('fido.idle.hold'),Address::NODE_ALL,$this->ao) as $ao) {
|
||||||
continue;
|
// Ignore any systems that are a Discoverd System
|
||||||
|
if ($ao->system->name === System::default) {
|
||||||
|
Log::alert(sprintf('%s:! Ignoring HOLD for discovered System [%s]',self::LOGKEY,$ao->ftn));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ignore any systems already marked hold or down
|
||||||
|
if ($ao->role & (Address::NODE_DOWN|Address::NODE_HOLD))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// Validate that the last seen was infact that long ago
|
||||||
|
if ($ao->system->last_seen->greaterThan($age))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
$contact = FALSE;
|
||||||
|
|
||||||
|
Log::info(sprintf('%s:- Marking [%s] as HOLD, not seen for [%d] days',self::LOGKEY,$ao->ftn,config('fido.idle.hold')));
|
||||||
|
|
||||||
|
// Email Alert
|
||||||
|
if ($ao->system->users->count()) {
|
||||||
|
Notification::send($ao->system->users,new NodeMarkedHoldEmail($ao->withoutRelations()));
|
||||||
|
$contact = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Netmail Alert (to othernet network address)
|
||||||
|
if ($ao->system->uncommon()->count()) {
|
||||||
|
Notification::route('netmail',$ao->system->uncommon()->first()->withoutRelations())->notify(new NodeMarkedHoldNetmail($ao->withoutRelations()));
|
||||||
|
$contact = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mark as DOWN
|
||||||
|
$ao->role |= Address::NODE_HOLD;
|
||||||
|
$ao->save();
|
||||||
|
|
||||||
|
$ao->contacted = $contact;
|
||||||
|
$result->push($ao);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ignore any systems already marked hold or down
|
|
||||||
if ($ao->role & (Address::NODE_DOWN|Address::NODE_HOLD))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
$contact = FALSE;
|
|
||||||
|
|
||||||
Log::info(sprintf('%s:- Marking [%s] as HOLD, not seen for [%d] days',self::LOGKEY,$ao->ftn,config('fido.idle.hold')));
|
|
||||||
|
|
||||||
// Email Alert
|
|
||||||
if ($ao->system->users->count()) {
|
|
||||||
Notification::send($ao->system->users,new NodeMarkedHoldEmail($ao->withoutRelations()));
|
|
||||||
$contact = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Netmail Alert (to othernet network address)
|
|
||||||
if ($ao->system->uncommon()->count()) {
|
|
||||||
Notification::route('netmail',$ao->system->uncommon()->first()->withoutRelations())->notify(new NodeMarkedHoldNetmail($ao->withoutRelations()));
|
|
||||||
$contact = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mark as DOWN
|
|
||||||
$ao->role |= Address::NODE_HOLD;
|
|
||||||
$ao->save();
|
|
||||||
|
|
||||||
$ao->contacted = $contact;
|
|
||||||
$result->push($ao);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($result->count())
|
if ($result->count())
|
||||||
@ -178,6 +202,10 @@ class AddressIdle implements ShouldQueue
|
|||||||
|
|
||||||
private function old(Domain $do,int $days,int $flags=0,Address $ao=NULL): Collection
|
private function old(Domain $do,int $days,int $flags=0,Address $ao=NULL): Collection
|
||||||
{
|
{
|
||||||
|
// Ignore dates that are zero
|
||||||
|
if (! $days)
|
||||||
|
return collect();
|
||||||
|
|
||||||
$age = Carbon::now()->subDays($days)->endOfDay();
|
$age = Carbon::now()->subDays($days)->endOfDay();
|
||||||
|
|
||||||
return Address::select([
|
return Address::select([
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user