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

Compare commits

base: bbs:14c505c15bd3691bf6eab01c82dc2b9d4beda7a2
Branches Tags
bbs:master
bbs:bbs
...
compare: bbs:c2516a2b54657eb2fadc543ad39a0a57f7fed71e
Branches Tags
bbs:master
bbs:bbs

3 Commits
14c505c15b ... c2516a2b54

Author SHA1 Message Date
Deon George
c2516a2b54 Change where processed packets are placed, if fido.packet_keep is true
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 37s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m42s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details
2024-05-12 20:50:19 +10:00
Deon George
171392cf40 Fix for session being reported negative 2024-05-12 20:46:00 +10:00
Deon George
64d37741a5 Fix when dispatching packets, and our address object has many relations already loaded, causing memory exhaustion due to recursion 2024-05-12 20:45:41 +10:00
3 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

4
app/Classes/File/Receive.php
View File

@ -128,10 +128,10 @@ class Receive extends Base
// If packet is greater than a size, lets queue it // If packet is greater than a size, lets queue it
if ($this->queue || ($this->receiving->size > config('fido.queue_size',0))) { if ($this->queue || ($this->receiving->size > config('fido.queue_size',0))) {
Log::info(sprintf('%s:- Packet [%s] will be sent to the queue for processing because its [%d] size, or queue forced',self::LOGKEY,$this->receiving->full_name,$this->receiving->size)); Log::info(sprintf('%s:- Packet [%s] will be sent to the queue for processing because its [%d] size, or queue forced',self::LOGKEY,$this->receiving->full_name,$this->receiving->size));
PacketProcess::dispatch($this->receiving,$this->ao,$rcvd_time); PacketProcess::dispatch($this->receiving,$this->ao->withoutRelations(),$rcvd_time);
} else } else
PacketProcess::dispatchSync($this->receiving,$this->ao,$rcvd_time); PacketProcess::dispatchSync($this->receiving,$this->ao->withoutRelations(),$rcvd_time);
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error(sprintf('%s:! Got error dispatching packet [%s] (%d:%s-%s).',self::LOGKEY,$this->receiving->full_name,$e->getLine(),$e->getFile(),$e->getMessage())); Log::error(sprintf('%s:! Got error dispatching packet [%s] (%d:%s-%s).',self::LOGKEY,$this->receiving->full_name,$e->getLine(),$e->getFile(),$e->getMessage()));

2
app/Classes/Node.php
View File

@ -92,7 +92,7 @@ class Node
// Return how long our session has been connected // Return how long our session has been connected
case 'session_time': case 'session_time':
return sprintf("%d",Carbon::now()->diffInSeconds($this->start_time)); return sprintf("%d",$this->start_time->diffInSeconds(Carbon::now()));
case 'system': case 'system':
case 'sysop': case 'sysop':

2
app/Jobs/PacketProcess.php
View File

@ -132,7 +132,7 @@ class PacketProcess implements ShouldQueue
} else { } else {
// If we want to keep the packet, we could do that logic here // If we want to keep the packet, we could do that logic here
if (config('fido.packet_keep')) { if (config('fido.packet_keep')) {
$dir = sprintf('%s/%s',config('fido.dir'),Carbon::now()->format('Ymd')); $dir = sprintf('%s/%d/%d/%d',config('fido.dir'),($x=Carbon::now())->format('Y'),$x->format('m'),$x->format('d'));
Log::debug(sprintf('%s:- Moving processed packet [%s] to [%s]',self::LOGKEY,$this->file->rel_name,$dir)); Log::debug(sprintf('%s:- Moving processed packet [%s] to [%s]',self::LOGKEY,$this->file->rel_name,$dir));
try { try {