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

Netmail waiting query optimisation, increase logging on what we have for a node
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 1m53s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 8s
Details

Browse Source
This commit is contained in:
Deon George 2024-06-26 22:37:38 +10:00
parent 5f3db71451
commit b891abb611
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Classes/File/Send.php
View File

@ -201,7 +201,7 @@ class Send extends Base
// Files
if (($x=$ao->filesWaiting())->count()) {
Log::debug(sprintf('%s:- [%d] Files(s) added for sending to [%s]',self::LOGKEY,$x->count(),$ao->ftn));
Log::info(sprintf('%s:- [%d] Files(s) added for sending to [%s]',self::LOGKEY,$x->count(),$ao->ftn));
// Add Files
foreach ($x as $fo) {

10
app/Models/Address.php
View File

@ -1135,8 +1135,8 @@ class Address extends Model
*/
public function getNetmail(): ?Packet
{
if (($num=$this->netmailAlertWaiting())->count()) {
Log::debug(sprintf('%s:= Packaging [%d] netmail alerts to [%s]',self::LOGKEY,$num->count(),$this->ftn));
if ($count=($num=$this->netmailAlertWaiting())->count()) {
Log::info(sprintf('%s:= Packaging [%d] netmail alerts to [%s]',self::LOGKEY,$count,$this->ftn));
$msgs = $num->get();
@ -1160,11 +1160,11 @@ class Address extends Model
);
}
if (($num=$this->netmailWaiting())->count()) {
Log::debug(sprintf('%s:= Got [%d] netmails for [%s] for sending',self::LOGKEY,$num->count(),$this->ftn));
if ($count=($num=$this->netmailWaiting())->count()) {
Log::info(sprintf('%s:= Got [%d] netmails for [%s] for sending',self::LOGKEY,$count,$this->ftn));
// Limit to max messages
if ($num->count() > $this->system->pkt_msgs)
if ($count > $this->system->pkt_msgs)
Log::alert(sprintf('%s:= Only sending [%d] netmails for [%s]',self::LOGKEY,$this->system->pkt_msgs,$this->ftn));
return $this->system->packet($this)->mail($num->take($this->system->pkt_msgs)->get());