Skip to content

Commit 6c01aad

Browse files
authored
[Chore] Only skip scheduled tests (alexjustesen#1803)
only skip scheduled tests
1 parent 073ffe7 commit 6c01aad

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

app/Actions/Speedtests/RunOoklaSpeedtest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ public function handle(?int $serverId = null, bool $scheduled = false): void
2222

2323
SpeedtestStarted::dispatch($result);
2424

25-
ExecuteOoklaSpeedtest::dispatch(result: $result, serverId: $serverId);
25+
ExecuteOoklaSpeedtest::dispatch(result: $result, serverId: $serverId, scheduled: $scheduled);
2626
}
2727
}

app/Jobs/Speedtests/ExecuteOoklaSpeedtest.php

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class ExecuteOoklaSpeedtest implements ShouldBeUnique, ShouldQueue
3737
public function __construct(
3838
public Result $result,
3939
public ?int $serverId = null,
40+
public bool $scheduled = false,
4041
) {}
4142

4243
/**
@@ -48,17 +49,19 @@ public function handle(): void
4849
return;
4950
}
5051

51-
$externalIp = GetExternalIpAddress::run();
52+
if ($this->scheduled) {
53+
$externalIp = GetExternalIpAddress::run();
5254

53-
$shouldSkip = $this->shouldSkip($externalIp);
55+
$shouldSkip = $this->shouldSkip($externalIp);
5456

55-
if ($shouldSkip !== false) {
56-
$this->markAsSkipped(
57-
message: $shouldSkip,
58-
externalIp: $externalIp,
59-
);
57+
if ($shouldSkip !== false) {
58+
$this->markAsSkipped(
59+
message: $shouldSkip,
60+
externalIp: $externalIp,
61+
);
6062

61-
return;
63+
return;
64+
}
6265
}
6366

6467
// Execute Speedtest

0 commit comments

Comments
 (0)