diff --git a/README.md b/README.md index bc851f6a..ee05a2ba 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Speedtest Tracker -[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.9.3-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) +[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.9.4-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses the [Ookla's speedtest cli](https://www.speedtest.net/apps/cli) package to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results. diff --git a/app/Helpers/SpeedtestHelper.php b/app/Helpers/SpeedtestHelper.php index ffd77891..10bf8628 100644 --- a/app/Helpers/SpeedtestHelper.php +++ b/app/Helpers/SpeedtestHelper.php @@ -263,8 +263,12 @@ class SpeedtestHelper { if(env('DB_CONNECTION') === 'sqlite') { if(env('DB_DATABASE') !== null) { $current = env('DB_DATABASE'); - if(File::copy($current, $current . '.bak')) { - return true; + try { + if(File::copy($current, $current . '.bak')) { + return true; + } + }catch(Exception $e) { + return false; } } @@ -283,23 +287,18 @@ class SpeedtestHelper { { Cache::flush(); - if(SpeedtestHelper::dbBackup() !== false) { - if(sizeof(Speedtest::whereNotNull('id')->get()) > 0) { - if(Speedtest::whereNotNull('id')->delete()) { - return [ - 'success' => true, - ]; - } - } + SpeedtestHelper::dbBackup(); - return [ - 'success' => true, - ]; + if(sizeof(Speedtest::whereNotNull('id')->get()) > 0) { + if(Speedtest::whereNotNull('id')->delete()) { + return [ + 'success' => true, + ]; + } } return [ - 'success' => false, - 'msg' => 'There was an error backing up the database. No speedtests have been deleted.' + 'success' => true, ]; } diff --git a/app/Http/Controllers/IntegrationsController.php b/app/Http/Controllers/IntegrationsController.php index 8878ff92..854168f1 100644 --- a/app/Http/Controllers/IntegrationsController.php +++ b/app/Http/Controllers/IntegrationsController.php @@ -78,7 +78,7 @@ class IntegrationsController extends Controller SettingsHelper::testNotification(); return response()->json([ - 'method' => 'test notificaiton agents' + 'method' => 'test notification agents' ], 200); } } diff --git a/app/Http/Controllers/SpeedtestController.php b/app/Http/Controllers/SpeedtestController.php index 544024cf..aacf870b 100644 --- a/app/Http/Controllers/SpeedtestController.php +++ b/app/Http/Controllers/SpeedtestController.php @@ -144,6 +144,7 @@ class SpeedtestController extends Controller public function run() { try { + SettingsHelper::loadIntegrationConfig(); $data = SpeedtestJob::dispatch(false, config('integrations')); return response()->json([ 'method' => 'run speedtest', diff --git a/changelog.json b/changelog.json index 07b1eac5..f22433c4 100644 --- a/changelog.json +++ b/changelog.json @@ -1,4 +1,14 @@ { + "1.9.4": [ + { + "description": "Changed integration config loading.", + "link": "" + }. + { + "description": "Added more tests.", + "link": "" + } + ], "1.9.3": [ { "description": "Updated dependencies.", diff --git a/config/speedtest.php b/config/speedtest.php index 38edff01..65a006e4 100644 --- a/config/speedtest.php +++ b/config/speedtest.php @@ -7,7 +7,7 @@ return [ |-------------------------------------------------------------------------- */ - 'version' => '1.9.3', + 'version' => '1.9.4', /* |--------------------------------------------------------------------------