File tree Expand file tree Collapse file tree 3 files changed +15
-24
lines changed
Expand file tree Collapse file tree 3 files changed +15
-24
lines changed Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ class ExecSpeedtest implements ShouldQueue
2323 * @return void
2424 */
2525 public function __construct (
26- public Speedtest |null $ speedtest = null
26+ public array |null $ speedtest = null
2727 ) {}
2828
2929 /**
@@ -44,15 +44,9 @@ public function handle()
4444
4545 $ output = $ process ->getOutput ();
4646
47- if (! blank ($ this ->speedtest )) {
48- $ this ->speedtest ->results ()->create ([
49- 'data ' => $ output ,
50- ]);
51- } else {
52- Result::create ([
53- 'data ' => $ output ,
54- ]);
55- }
47+ Result::create ([
48+ 'data ' => $ output ,
49+ ]);
5650
5751 return 0 ;
5852 }
Original file line number Diff line number Diff line change 22
33namespace App \Jobs ;
44
5- use App \Models \Speedtest ;
65use Cron \CronExpression ;
76use Illuminate \Bus \Queueable ;
87use Illuminate \Contracts \Queue \ShouldBeUnique ;
98use Illuminate \Contracts \Queue \ShouldQueue ;
109use Illuminate \Foundation \Bus \Dispatchable ;
1110use Illuminate \Queue \InteractsWithQueue ;
1211use Illuminate \Queue \SerializesModels ;
13- use Illuminate \ Support \ Facades \ Log ;
12+ use Symfony \ Component \ Yaml \ Yaml ;
1413
1514class SearchForSpeedtests implements ShouldQueue
1615{
@@ -33,19 +32,16 @@ public function __construct()
3332 */
3433 public function handle ()
3534 {
36- $ tests = Speedtest:: query ()
37- -> where ( ' next_run_at ' , now ()-> format ( ' Y-m-d H:i ' ))
38- -> get ( );
35+ $ config = Yaml:: parseFile (
36+ base_path (). ' /config.yml '
37+ );
3938
40- foreach ($ tests as $ item ) {
41- ExecSpeedtest::dispatch (speedtest: $ item );
39+ $ speedtest = $ config ['speedtest ' ];
4240
43- $ cron = new CronExpression ($ item -> schedule );
41+ $ cron = new CronExpression ($ speedtest [ ' schedule ' ] );
4442
45- $ item -> next_run_at = $ cron ->getNextRunDate ()-> format ( ' Y-m-d H:i ' );
46- $ item -> save ( );
43+ if ( $ cron ->isDue () && $ speedtest [ ' enabled ' ]) {
44+ ExecSpeedtest:: dispatch (speedtest: $ speedtest );
4745 }
48-
49- Log::info ($ tests );
5046 }
5147}
Original file line number Diff line number Diff line change 22authentication : true # Set to false to disable authentication
33influxdb :
44 enabled : true
5- host_tag : ' speedtest'
5+ host_tag : ' speedtest-tracker '
66 retention : ' 30d'
77notifications :
88 channels :
@@ -11,6 +11,7 @@ notifications:
1111 slack :
1212 webhook_url : null # Set as null to disable
1313speedtest :
14+ enabled : true
1415 schedule : ' */60 * * * *' # every hour
1516 ookla_server_id : null # specify a server ID to use a sepecific server
16- tz : ' America/New_York '
17+ tz : ' UTC '
You can’t perform that action at this time.
0 commit comments