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

Change default internal caching to off, and added test to make sure things are cached if on. More debugging with packet name for netmails

Browse Source
This commit is contained in:
Deon George 2023-01-25 16:26:10 +11:00
parent 63e3397aee
commit 3dc18a3f1f
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Classes/FTN/Packet.php
View File

@ -58,7 +58,7 @@ class Packet extends FTNBase implements \Iterator, \Countable
public Collection $messages; // Messages in the Packet public Collection $messages; // Messages in the Packet
public Collection $errors; // Messages that fail validation public Collection $errors; // Messages that fail validation
private string $name; // Packet name private string $name; // Packet name
public bool $use_cache = TRUE; // Use a cache for messages. public bool $use_cache = FALSE; // Use a cache for messages.
private int $index; // Our array index private int $index; // Our array index
/** /**
@ -124,7 +124,7 @@ class Packet extends FTNBase implements \Iterator, \Countable
* @throws InvalidPacketException * @throws InvalidPacketException
*/ */
public static function process(mixed $f,string $name,int $size,System $system=NULL,bool $use_cache=TRUE): self public static function process(mixed $f,string $name,int $size,System $system=NULL,bool $use_cache=FALSE): self
{ {
Log::debug(sprintf('%s:+ Opening Packet [%s] with size [%d]',self::LOGKEY,$name,$size)); Log::debug(sprintf('%s:+ Opening Packet [%s] with size [%d]',self::LOGKEY,$name,$size));
@ -523,7 +523,9 @@ class Packet extends FTNBase implements \Iterator, \Countable
if ($this->use_cache) { if ($this->use_cache) {
$key = urlencode($msg->msgid ?: sprintf('%s %s',$msg->fftn,Carbon::now()->timestamp)); $key = urlencode($msg->msgid ?: sprintf('%s %s',$msg->fftn,Carbon::now()->timestamp));
Cache::forever($key,serialize($msg)); if (! Cache::forever($key,serialize($msg)))
throw new \Exception(sprintf('Caching failed for key [%s]?',$key));
$this->messages->push($key); $this->messages->push($key);
} else { } else {

3
app/Console/Commands/PacketProcess.php
View File

@ -3,7 +3,6 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Support\Arr;
use App\Classes\File; use App\Classes\File;
use App\Classes\FTN\Packet; use App\Classes\FTN\Packet;
@ -45,7 +44,7 @@ class PacketProcess extends Command
// @todo Quick check that the packet should be processed by us. // @todo Quick check that the packet should be processed by us.
// @todo validate that the packet's zone is in the domain. // @todo validate that the packet's zone is in the domain.
$this->info(sprintf('Processing message from [%s] with msgid [%s]',$msg->fboss,$msg->msgid)); $this->info(sprintf('Processing message from [%s] with msgid [%s] in (%s)',$msg->fboss,$msg->msgid,$f->pktName()));
// Dispatch job. // Dispatch job.
Job::dispatchSync($msg,$f->pktName(),$this->option('nobot')); Job::dispatchSync($msg,$f->pktName(),$this->option('nobot'));

7
app/Jobs/MessageProcess.php
View File

@ -41,6 +41,13 @@ class MessageProcess implements ShouldQueue
// If we are a netmail // If we are a netmail
if ($this->msg->isNetmail()) { if ($this->msg->isNetmail()) {
Log::info(sprintf('%s:Processing Netmail [%s] to (%s) [%s] from (%s) [%s].',
self::LOGKEY,
$this->msg->msgid,
$this->msg->user_to,$this->msg->tftn,
$this->msg->user_from,$this->msg->fftn,
));
// @todo Enable checks to reject old messages // @todo Enable checks to reject old messages
// @todo Enable checks to reject duplicate // @todo Enable checks to reject duplicate
// @todo Enable checks to see if this is a file request or file send // @todo Enable checks to see if this is a file request or file send