Installer followup (#519)

* remove queue worker service creation from installer * auto check redis
pelican-dev · Aug 4, 2024 · 953ee94 · 953ee94
1 parent 496eaaa
commit 953ee94
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/app/Console/Commands/Environment/QueueWorkerServiceCommand.php b/app/Console/Commands/Environment/QueueWorkerServiceCommand.php
@@ -14,7 +14,6 @@ class QueueWorkerServiceCommand extends Command
         {--service-name= : Name of the queue worker service.}
         {--user= : The user that PHP runs under.}
         {--group= : The group that PHP runs under.}
-        {--use-redis : Whether redis is used.}
         {--overwrite : Force overwrite if the service file already exists.}';
 
     public function handle(): void
@@ -32,7 +31,8 @@ public function handle(): void
         $user = $this->option('user') ?? $this->ask('Webserver User', 'www-data');
         $group = $this->option('group') ?? $this->ask('Webserver Group', 'www-data');
 
-        $afterRedis = $this->option('use-redis') ? '
+        $redisUsed = config('queue.default') === 'redis' || config('session.driver') === 'redis' || config('cache.default') === 'redis';
+        $afterRedis = $redisUsed ? '
 After=redis-server.service' : '';
 
         $basePath = base_path();

diff --git a/app/Filament/Pages/Installer/PanelInstaller.php b/app/Filament/Pages/Installer/PanelInstaller.php
@@ -99,18 +99,6 @@ public function submit()
             $variables = array_get($inputs, 'env');
             $this->writeToEnvironment($variables);
 
-            $redisUsed = count(collect($variables)->filter(function ($item) {
-                return $item === 'redis';
-            })) !== 0;
-
-            // Create queue worker service (if needed)
-            if ($variables['QUEUE_CONNECTION'] !== 'sync') {
-                Artisan::call('p:environment:queue-service', [
-                    '--use-redis' => $redisUsed,
-                    '--overwrite' => true,
-                ]);
-            }
-
             // Run migrations
             Artisan::call('migrate', [
                 '--force' => true,