* Use queues for notifications #1154 * Styles * Update defaults * Include queueworker
This commit is contained in:
32
app/Console/Commands/EmailTest.php
Normal file
32
app/Console/Commands/EmailTest.php
Normal file
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App;
|
||||
use App\Contracts\Command;
|
||||
|
||||
class EmailTest extends Command
|
||||
{
|
||||
protected $signature = 'phpvms:email-test';
|
||||
protected $description = 'Send a test notification to admins';
|
||||
|
||||
/**
|
||||
* Run dev related commands
|
||||
*
|
||||
* @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
/** @var App\Notifications\EventHandler $eventHandler */
|
||||
$eventHandler = app(App\Notifications\EventHandler::class);
|
||||
|
||||
$news = new App\Models\News();
|
||||
$news->user_id = 1;
|
||||
$news->subject = 'Test News';
|
||||
$news->body = 'Test Body';
|
||||
$news->save();
|
||||
|
||||
$newsEvent = new App\Events\NewsAdded($news);
|
||||
$eventHandler->onNewsAdded($newsEvent);
|
||||
}
|
||||
}
|
||||
38
app/Console/Commands/ProcessQueue.php
Normal file
38
app/Console/Commands/ProcessQueue.php
Normal file
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App;
|
||||
use App\Contracts\Command;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class ProcessQueue extends Command
|
||||
{
|
||||
protected $signature = 'queue:cron';
|
||||
protected $description = 'Process the queue from a cron job';
|
||||
|
||||
/**
|
||||
* Run the queue tasks
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
Artisan::call('queue:work', [
|
||||
'--sansdaemon' => null,
|
||||
'--stop-when-empty' => null,
|
||||
]);
|
||||
|
||||
Log::info(Artisan::output());
|
||||
///** @var App\Support\WorkCommand $queueWorker */
|
||||
//$queueWorker = new App\Support\WorkCommand(app('queue.worker'), app('cache.store'));
|
||||
|
||||
//$queueWorker->setInput($queueWorker->createInputFromArguments([]));
|
||||
//$queueWorker->handle();
|
||||
|
||||
/*$output = $this->call('queue:work', [
|
||||
'--stop-when-empty' => null,
|
||||
]);
|
||||
|
||||
Log::info($output);*/
|
||||
}
|
||||
}
|
||||
25
app/Console/Cron/JobQueue.php
Normal file
25
app/Console/Cron/JobQueue.php
Normal file
@@ -0,0 +1,25 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Cron;
|
||||
|
||||
use App\Contracts\Command;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
|
||||
/**
|
||||
* This just calls the CronHourly event, so all of the
|
||||
* listeners, etc can just be called to run those tasks
|
||||
*/
|
||||
class JobQueue extends Command
|
||||
{
|
||||
protected $signature = 'cron:queue';
|
||||
protected $description = 'Run the cron queue tasks';
|
||||
protected $schedule;
|
||||
|
||||
public function handle(): void
|
||||
{
|
||||
$this->redirectLoggingToFile('cron');
|
||||
Artisan::call('queue:cron');
|
||||
|
||||
$this->info(Artisan::output());
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Console;
|
||||
|
||||
use App\Console\Cron\Hourly;
|
||||
use App\Console\Cron\JobQueue;
|
||||
use App\Console\Cron\Monthly;
|
||||
use App\Console\Cron\Nightly;
|
||||
use App\Console\Cron\Weekly;
|
||||
@@ -25,6 +26,10 @@ class Kernel extends ConsoleKernel
|
||||
*/
|
||||
protected function schedule(Schedule $schedule): void
|
||||
{
|
||||
$schedule->command(JobQueue::class)
|
||||
->everyMinute()
|
||||
->withoutOverlapping();
|
||||
|
||||
$schedule->command(Nightly::class)->dailyAt('01:00');
|
||||
$schedule->command(Weekly::class)->weeklyOn(0);
|
||||
$schedule->command(Monthly::class)->monthlyOn(1);
|
||||
|
||||
Reference in New Issue
Block a user