Skip to content

A self-hosted media server and file management system

feat: basic redis queue setup

aminnausin86c58bbb89ac
diff --git a/.env.example b/.env.example
index ed3d0142..664e914e 100755
--- a/.env.example
+++ b/.env.example
@@ -43,7 +43,7 @@ SESSION_DOMAIN="${APP_HOST}"
BROADCAST_CONNECTION=reverb
FILESYSTEM_DISK=local
-QUEUE_CONNECTION=database
+QUEUE_CONNECTION=redis
CACHE_DRIVER=file
CACHE_STORE=database
diff --git a/app/Jobs/IndexFiles.php b/app/Jobs/IndexFiles.php
index 54bc730b..288f5611 100755
--- a/app/Jobs/IndexFiles.php
+++ b/app/Jobs/IndexFiles.php
@@ -40,6 +40,10 @@ class IndexFiles implements ShouldBeUnique, ShouldQueue {
* Create a new job instance.
*/
public function __construct($taskId) {
+ if (config('queue.default') === 'redis') {
+ $this->onQueue('pipeline');
+ }
+
$subTask = SubTask::create(['task_id' => $taskId, 'status' => TaskStatus::PENDING, 'name' => 'Index Files']); //
$this->taskId = $taskId;
$this->subTaskId = $subTask->id;
diff --git a/app/Jobs/SyncFiles.php b/app/Jobs/SyncFiles.php
index 78525d92..e97f7be6 100755
--- a/app/Jobs/SyncFiles.php
+++ b/app/Jobs/SyncFiles.php
@@ -33,7 +33,9 @@ class SyncFiles implements ShouldBeUnique, ShouldQueue {
* Create a new job instance.
*/
public function __construct($taskId) {
- //
+ if (config('queue.default') === 'redis') {
+ $this->onQueue('pipeline');
+ }
$subTask = SubTask::create(['task_id' => $taskId, 'status' => TaskStatus::PENDING, 'name' => 'Sync Files']); //
$this->taskId = $taskId;
$this->subTaskId = $subTask->id;
diff --git a/app/Providers/HorizonServiceProvider.php b/app/Providers/HorizonServiceProvider.php
index 59599dc9..e25bd6d2 100644
--- a/app/Providers/HorizonServiceProvider.php
+++ b/app/Providers/HorizonServiceProvider.php
@@ -6,13 +6,11 @@ use Illuminate\Support\Facades\Gate;
use Laravel\Horizon\Horizon;
use Laravel\Horizon\HorizonApplicationServiceProvider;
-class HorizonServiceProvider extends HorizonApplicationServiceProvider
-{
+class HorizonServiceProvider extends HorizonApplicationServiceProvider {
/**
* Bootstrap any application services.
*/
- public function boot(): void
- {
+ public function boot(): void {
parent::boot();
// Horizon::routeSmsNotificationsTo('15556667777');
@@ -25,8 +23,7 @@ class HorizonServiceProvider extends HorizonApplicationServiceProvider
*
* This gate determines who can access Horizon in non-local environments.
*/
- protected function gate(): void
- {
+ protected function gate(): void {
Gate::define('viewHorizon', function ($user = null) {
return in_array(optional($user)->email, [
//
diff --git a/config/horizon.php b/config/horizon.php
index 5101f6f0..2b997423 100644
--- a/config/horizon.php
+++ b/config/horizon.php
@@ -1,6 +1,7 @@
<?php
use Illuminate\Support\Str;
+use Laravel\Pulse\Http\Middleware\Authorize;
return [
@@ -56,7 +57,7 @@ return [
'prefix' => env(
'HORIZON_PREFIX',
- Str::slug(env('APP_NAME', 'laravel'), '_').'_horizon:'
+ Str::slug(env('APP_NAME', 'laravel'), '_') . '_horizon:'
),
/*
@@ -70,7 +71,11 @@ return [
|
*/
- 'middleware' => ['web'],
+ 'middleware' => [
+ 'web',
+ 'api',
+ Authorize::class,
+ ],
/*
|--------------------------------------------------------------------------
@@ -180,7 +185,7 @@ return [
*/
'defaults' => [
- 'supervisor-1' => [
+ 'supervisor-default' => [
'connection' => 'redis',
'queue' => ['default'],
'balance' => 'auto',
@@ -193,21 +198,64 @@ return [
'timeout' => 60,
'nice' => 0,
],
+ 'supervisor-high' => [
+ 'connection' => 'redis',
+ 'queue' => ['high'],
+ 'balance' => 'auto',
+ 'autoScalingStrategy' => 'time',
+ 'maxProcesses' => 1,
+ 'maxTime' => 0,
+ 'maxJobs' => 0,
+ 'memory' => 128,
+ 'tries' => 1,
+ 'timeout' => 60,
+ 'nice' => 0,
+ ],
+ 'supervisor-pipeline' => [
+ 'connection' => 'redis',
+ 'queue' => ['pipeline'],
+ 'balance' => false,
+ 'processes' => 1, // enforced order
+ 'tries' => 3,
+ ],
],
'environments' => [
'production' => [
- 'supervisor-1' => [
+ 'supervisor-default' => [
'maxProcesses' => 10,
'balanceMaxShift' => 1,
'balanceCooldown' => 3,
],
+ 'supervisor-high' => [
+ 'connection' => 'redis',
+ 'queue' => ['high'],
+ 'maxProcesses' => 5,
+ 'balanceMaxShift' => 1,
+ 'balanceCooldown' => 3,
+ ],
+ 'supervisor-pipeline' => [
+ 'connection' => env('QUEUE_CONNECTION', 'database'),
+ 'queue' => ['pipeline'],
+ ],
],
'local' => [
- 'supervisor-1' => [
+ 'supervisor-default' => [
+ 'connection' => env('QUEUE_CONNECTION', 'database'),
+ 'queue' => ['default'],
'maxProcesses' => 3,
],
+ 'supervisor-high' => [
+ 'connection' => env('QUEUE_CONNECTION', 'database'),
+ 'queue' => ['high'],
+ 'balance' => 'auto',
+ 'maxProcesses' => 3,
+ ],
+ 'supervisor-pipeline' => [
+ 'connection' => env('QUEUE_CONNECTION', 'database'),
+ 'queue' => ['pipeline'],
+ ],
],
],
];