Skip to content

A self-hosted media server and file management system

fix: config provider blocks composer commands

aminnausin32c895ea9e2b
diff --git a/app/Console/Commands/ConfigureHorizon.php b/app/Console/Commands/ConfigureHorizon.php
new file mode 100644
index 00000000..4f3f5124
--- /dev/null
+++ b/app/Console/Commands/ConfigureHorizon.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Services\Server\ServerConfigService;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
+
+class ConfigureHorizon extends Command {
+ /**
+ * The name and signature of the console command.
+ *
+ * @var string
+ */
+ protected $signature = 'horizon:configure';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Load Horizon worker config from database to config file';
+
+ /**
+ * Execute the console command.
+ */
+ public function handle(ServerConfigService $config) {
+ if (! app()->environment('production')) {
+ $this->warn('Only affects production environments');
+
+ return 0;
+ }
+
+ $maxScanWorkers = $config->get('max_scan_workers', 10);
+ $maxEventWorkers = $config->get('max_event_workers', 5);
+
+ $content = "<?php\n\nreturn [\n";
+ $content .= " 'max_scan_workers' => {$maxScanWorkers},\n";
+ $content .= " 'max_event_workers' => {$maxEventWorkers},\n";
+ $content .= "];\n";
+
+ $path = config_path('horizon-dynamic.php');
+ File::put($path, $content);
+
+ $this->info("Horizon config loaded: scan={$maxScanWorkers}, event={$maxEventWorkers}");
+ $this->call('config:clear');
+
+ return 0;
+ }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 082ff33f..a3c21b54 100755
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -37,7 +37,7 @@ class AppServiceProvider extends ServiceProvider {
*/
public function boot(): void {
//
- Pulse::user(fn($user) => [
+ Pulse::user(fn ($user) => [
'name' => $user->name,
'extra' => $user->email,
]);
diff --git a/app/Providers/ServerConfigServiceProvider.php b/app/Providers/ServerConfigServiceProvider.php
index 629a2385..c2d4941f 100644
--- a/app/Providers/ServerConfigServiceProvider.php
+++ b/app/Providers/ServerConfigServiceProvider.php
@@ -16,16 +16,18 @@ class ServerConfigServiceProvider extends ServiceProvider {
/**
* Bootstrap services.
+ *
+ * This breaks composer commands: DO NOT USE
*/
public function boot(): void {
try {
- // $config = app(ServerConfigService::class);
+ $config = app(ServerConfigService::class);
$env = app()->environment();
- // config([
- // "horizon.environments.{$env}.supervisor-default.maxProcesses" => $config->get('max_scan_workers', 10),
- // "horizon.environments.{$env}.supervisor-high.maxProcesses" => $config->get('max_event_workers', 5),
- // ]);
+ config([
+ "horizon.environments.{$env}.supervisor-default.maxProcesses" => $config->get('max_scan_workers', 10),
+ "horizon.environments.{$env}.supervisor-high.maxProcesses" => $config->get('max_event_workers', 5),
+ ]);
} catch (\Exception $e) {
Log::error('Unable to load worker limits from DB server config.', ['error' => $e->getMessage()]);
}
diff --git a/bootstrap/cache/services.php b/bootstrap/cache/services.php
index 813de6d8..7bb976f6 100755
--- a/bootstrap/cache/services.php
+++ b/bootstrap/cache/services.php
@@ -49,7 +49,6 @@
45 => 'App\\Providers\\AppServiceProvider',
46 => 'App\\Providers\\HorizonServiceProvider',
47 => 'App\\Providers\\PathResolverServiceProvider',
- 48 => 'App\\Providers\\ServerConfigServiceProvider',
),
'eager' =>
array (
@@ -84,7 +83,6 @@
28 => 'App\\Providers\\AppServiceProvider',
29 => 'App\\Providers\\HorizonServiceProvider',
30 => 'App\\Providers\\PathResolverServiceProvider',
- 31 => 'App\\Providers\\ServerConfigServiceProvider',
),
'deferred' =>
array (
diff --git a/bootstrap/providers.php b/bootstrap/providers.php
index 0610b3a9..7b2ba036 100644
--- a/bootstrap/providers.php
+++ b/bootstrap/providers.php
@@ -5,5 +5,4 @@ return [
App\Providers\AppServiceProvider::class,
App\Providers\HorizonServiceProvider::class,
App\Providers\PathResolverServiceProvider::class,
- App\Providers\ServerConfigServiceProvider::class,
];
diff --git a/config/horizon.php b/config/horizon.php
index 7797e75e..ef4c2818 100644
--- a/config/horizon.php
+++ b/config/horizon.php
@@ -3,6 +3,13 @@
use Illuminate\Support\Str;
use Laravel\Pulse\Http\Middleware\Authorize;
+$dynamic = [];
+$dynamicPath = __DIR__ . '/horizon-dynamic.php';
+
+if (file_exists($dynamicPath) && ! app()->runningUnitTests()) {
+ $dynamic = require $dynamicPath;
+}
+
return [
/*
@@ -223,12 +230,12 @@ return [
'environments' => [
'production' => [
'supervisor-default' => [
- 'maxProcesses' => 10,
+ 'maxProcesses' => $dynamic['max_scan_workers'] ?? env('MAX_SCAN_WORKERS', 10),
'balanceMaxShift' => 1,
'balanceCooldown' => 3,
],
'supervisor-high' => [
- 'maxProcesses' => 5,
+ 'maxProcesses' => $dynamic['ax_event_workers'] ?? env('MAX_EVENT_WORKERS', 5),
'balanceMaxShift' => 1,
'balanceCooldown' => 3,
],