Skip to content

[Feature] Use ping instead of a HTTP get request to check for internet connection #1493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexjustesen merged 4 commits into from
Jun 8, 2024
Merged

[Feature] Use ping instead of a HTTP get request to check for internet connection #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70203a6
added iputils-ping to dev dockerfile
alexjustesen Jun 8, 2024
f80309b
required geerlingguy/ping
alexjustesen Jun 8, 2024
781db67
added speedtest.ping_url config
alexjustesen Jun 8, 2024
2c87da3
use ping instead of an http get request to check for internet connection
alexjustesen Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions app/Jobs/Speedtests/ExecuteOoklaSpeedtest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Http;
use JJG\Ping;
use Symfony\Component\Process\Exception\ProcessFailedException;
use Symfony\Component\Process\Process;

Expand Down Expand Up @@ -43,11 +43,14 @@ public function __construct(
public function handle(): void
{
/**
* Check to make sure there is an internet connection first.
* Check for an internet connection first.
*/
try {
Http::retry(3, 500)->get('1.1.1.1');
} catch (\Throwable $th) {
$ping = new Ping(
host: config('speedtest.ping_url'),
timeout: 3,
);

if ($ping->ping() === false) {
$this->result->update([
'data' => [
'type' => 'log',
Expand Down
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"dragonmantank/cron-expression": "^3.3.3",
"filament/filament": "^3.2.86",
"filament/spatie-laravel-settings-plugin": "^3.2.86",
"geerlingguy/ping": "^1.2.1",
"guzzlehttp/guzzle": "^7.8.1",
"influxdata/influxdb-client-php": "^3.5",
"laravel-notification-channels/telegram": "^5.0",
Expand Down
39 changes: 38 additions & 1 deletion composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions config/speedtest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
/**
* Speedtest settings.
*/
'ping_url' => env('SPEEDTEST_PING_URL', '1.1.1.1'),

'schedule' => env('SPEEDTEST_SCHEDULE'),

'servers' => env('SPEEDTEST_SERVERS', ''),
Expand Down
2 changes: 1 addition & 1 deletion docker/8.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

RUN apt-get update \
&& mkdir -p /etc/apt/keyrings \
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils librsvg2-bin fswatch nano cron \
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils iputils-ping librsvg2-bin fswatch nano cron \
&& curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /etc/apt/keyrings/ppa_ondrej_php.gpg > /dev/null \
&& echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
&& apt-get update \
Expand Down