From b891abb611db1d613c33f979d45dba4cfd32a881 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Wed, 26 Jun 2024 22:37:38 +1000
Subject: [PATCH] Netmail waiting query optimisation, increase logging on what
 we have for a node

---
 app/Classes/File/Send.php |  2 +-
 app/Models/Address.php    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Classes/File/Send.php b/app/Classes/File/Send.php
index 2bb7d91..b1debba 100644
--- a/app/Classes/File/Send.php
+++ b/app/Classes/File/Send.php
@@ -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) {
diff --git a/app/Models/Address.php b/app/Models/Address.php
index 0de732c..fe45b15 100644
--- a/app/Models/Address.php
+++ b/app/Models/Address.php
@@ -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());