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

Show system name on AbsentNodes echomail
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 43s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m43s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 12s
Details

Browse Source
This commit is contained in:
Deon George 2024-05-26 22:01:35 +10:00
parent fe18968c57
commit bf21671a1f
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Notifications/Echomails/AbsentNodes.php
View File

@ -60,19 +60,37 @@ class AbsentNodes extends Echomails
$msg->addText("The following nodes have had their status changed, because they are absent from the network.\r\r"); $msg->addText("The following nodes have had their status changed, because they are absent from the network.\r\r");
// Nodes marked HOLD - will be marked down ... // Nodes marked HOLD - will be marked down ...
foreach ($this->aos->filter(fn($item)=>$item->role & Address::NODE_HOLD) as $ao) if (($x=$this->aos->filter(fn($item)=>$item->role & Address::NODE_HOLD))->count()) {
$msg->addText(sprintf('* %s marked HOLD, last seen %d days ago',$ao->ftn4d,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r"); $msg->addText("The following nodes have been marked HOLD:\r");
foreach ($x as $ao)
$msg->addText(sprintf('* %s (%s), last seen %d days ago',$ao->ftn4d,$ao->system->name,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r");
$msg->addText("\r");
}
// Nodes marked DOWN - will be delisted on... // Nodes marked DOWN - will be delisted on...
foreach ($this->aos->filter(fn($item)=>$item->role & Address::NODE_DOWN) as $ao) if (($x=$this->aos->filter(fn($item)=>$item->role & Address::NODE_DOWN))->count()) {
$msg->addText(sprintf('* %s marked DOWN, last seen %d days ago',$ao->ftn4d,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r"); $msg->addText("The following nodes have been marked DOWN:\r");
foreach ($x as $ao)
$msg->addText(sprintf('* %s (%s), last seen %d days ago',$ao->ftn4d,$ao->system->name,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r");
$msg->addText("\r");
}
// Nodes DELISTED // Nodes DELISTED
foreach ($this->aos->filter(fn($item)=>! $item->active) as $ao) if (($x=$this->aos->filter(fn($item)=>! $item->active))->count()) {
$msg->addText(sprintf('* %s DE-LISTED, last seen %d days ago',$ao->ftn4d,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r"); $msg->addText("The following nodes have been DE-LISTED:\r");
foreach ($x as $ao)
$msg->addText(sprintf('* %s (%s), last seen %d days ago',$ao->ftn4d,$ao->system->name,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r");
$msg->addText("\r");
}
if ($this->aos->filter(fn($item)=>(! $item->contacted))->count()) if ($this->aos->filter(fn($item)=>(! $item->contacted))->count())
$msg->addText("\r^ Unable to contact these nodes.\r"); $msg->addText("^ Unable to contact these nodes.\r");
$msg->addText("\rEmails and/or Netmails have been sent to these nodes. If you can help let them know that they have outstanding mail on the Hub, that would be helpful :)"); $msg->addText("\rEmails and/or Netmails have been sent to these nodes. If you can help let them know that they have outstanding mail on the Hub, that would be helpful :)");