Compare commits

...

3 Commits

Author SHA1 Message Date
e1bd2b7d06 Add a maintenance page
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 33s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m47s
Create Docker Image / Final Docker Image Manifest (push) Successful in 8s
2024-10-23 12:42:13 +11:00
1837e69520 Increase number of attempts when trying to poll a system
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 34s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m46s
Create Docker Image / Final Docker Image Manifest (push) Successful in 9s
2024-10-23 12:07:10 +11:00
da098064bc Improvements to handle rogue 2D adresses 2024-10-23 12:06:53 +11:00
3 changed files with 33 additions and 9 deletions

View File

@ -27,7 +27,7 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
private const LOGKEY = 'JAP'; private const LOGKEY = 'JAP';
public int $tries = 5; public int $tries = 10;
public int $maxExceptions = 1; public int $maxExceptions = 1;
public bool $failOnTimeout = TRUE; public bool $failOnTimeout = TRUE;

View File

@ -254,20 +254,28 @@ class Address extends Model
$ftn = self::parseFTN($address); $ftn = self::parseFTN($address);
$do = $ftn['d'] ? Domain::where('name',$ftn['d'])->single() : NULL; $do = $ftn['d'] ? Domain::where('name',$ftn['d'])->single() : NULL;
if ($ftn['z'] === 0)
Log::alert(sprintf('%s:! newFTN was parsed an FTN [%s] with a zero zone',self::LOGKEY,$address));
$zo = Zone::where('zone_id',$ftn['z'])
->when($do,fn($query)=>$query->where('domain_id',$do->id))
->single();
$o = new self; $o = new self;
$o->zone_id = $zo?->id;
$o->region_id = $ftn['r']; $o->region_id = $ftn['r'];
$o->host_id = $ftn['n']; $o->host_id = $ftn['n'];
$o->node_id = $ftn['f']; $o->node_id = $ftn['f'];
$o->point_id = $ftn['p']; $o->point_id = $ftn['p'];
if ($ftn['z'] === 0) {
Log::alert(sprintf('%s:! newFTN was parsed an FTN [%s] with a zero zone, adding empty zone in domain',self::LOGKEY,$address));
$zo = new Zone;
$zo->domain_id = $do?->id;
} else {
$zo = Zone::where('zone_id',$ftn['z'])
->when($do,fn($query)=>$query->where('domain_id',$do->id))
->single();
$o->zone_id = $zo?->id;
}
$o->zone()->associate($zo);
return $o; return $o;
} }
@ -761,6 +769,9 @@ class Address extends Model
if (! $this->relationLoaded('zone')) if (! $this->relationLoaded('zone'))
$this->load(['zone:id,domain_id,zone_id']); $this->load(['zone:id,domain_id,zone_id']);
if (! $this->zone)
throw new InvalidFTNException(sprintf('Invalid Zone for FTN address [%d/%d.%d@%s]',$this->host_id ?: $this->region_id,$this->node_id,$this->point_id,$this->domain?->name));
return sprintf('%d:%s',$this->zone->zone_id,$this->getFTN2DAttribute()); return sprintf('%d:%s',$this->zone->zone_id,$this->getFTN2DAttribute());
} }

View File

@ -0,0 +1,13 @@
@extends('layouts.auth')
@section('htmlheader_title')
Down for a bit
@endsection
@section('content')
<div class="text-center">
<h1 class="m-5" style="border-bottom: 0;">Down for a bit, back soon!</h1>
<p class="text-center"><strong class="highlight danger"><small>If it has been this way too long, <br>you might want to let somebody know.</small></strong></p>
</div>
@endsection