From d8c68bcaa2ba911478395fc15047f96746b8701e Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Thu, 27 Jun 2024 08:20:52 +1000
Subject: [PATCH] Change DNS logging, especially around missing details

---
 app/Classes/Protocol/DNS.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Protocol/DNS.php b/app/Classes/Protocol/DNS.php
index 190b3c7..6f5f215 100644
--- a/app/Classes/Protocol/DNS.php
+++ b/app/Classes/Protocol/DNS.php
@@ -232,14 +232,15 @@ final class DNS extends BaseProtocol
 				// Check we have the right record
 				if ((! $ao) || (($rootdn !== self::TLD) && ((! $ao->zone->domain->dnsdomain) || ($ao->zone->domain->dnsdomain !== $rootdn)))) {
 					Log::alert(sprintf('%s:= No DNS record for [%d:%d/%d.%d@%s]',self::LOGKEY,$z,$n,$f,$p,$d));
+
 					return $this->nameerr();
 				}
 
 				switch ($this->query->type) {
 					case self::DNS_TYPE_SRV:
-						Log::info(sprintf('%s:= Returning [%s] for DNS query [%s]',self::LOGKEY,$ao->system->address,$ao->ftn));
-
 						if (($ao->system->address) && ($xx=$ao->system->mailers->where('id',$mailer->id)->pop())) {
+							Log::info(sprintf('%s:= Returning [%s] for DNS query [%s]',self::LOGKEY,$ao->system->address,$ao->ftn));
+
 							return $this->reply(
 								self::DNS_NOERROR,
 								[serialize([
@@ -250,6 +251,8 @@ final class DNS extends BaseProtocol
 								]) => self::DNS_TYPE_SRV]);
 
 						} else {
+							Log::alert(sprintf('%s:! No/incomplete hostname/port details for [%d] for DNS query [%s]',self::LOGKEY,$ao->system->id,$ao->ftn));
+
 							return $this->nodata();
 						}
 
@@ -261,7 +264,7 @@ final class DNS extends BaseProtocol
 							[serialize($ao->system->name) => self::DNS_TYPE_TXT]);
 
 					default:
-						Log::info(sprintf('%s:= Returning [%s] for DNS query [%s]',self::LOGKEY,$ao->system->address,$ao->ftn));
+						Log::info(sprintf('%s:= Returning [%s] for DNS query [%s]',self::LOGKEY,$ao->system->address ?: 'NO ADDRESS',$ao->ftn));
 
 						return (! $ao->system->address)
 							? $this->nodata()