banquise/pelican-panel-banquise
7
0
Fork 0
forked from banquise/pelican-panel-mirror
Code Pull Requests Activity

Merge pull request #326 from Boy132/fix/artisan-queue-again

Browse Source 
Another call fix in AppSettingsCommand
This commit is contained in:
Lance Pioch 2024-06-04 17:29:48 -04:00 committed by GitHub
commit 2d6e30b646
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/Environment/AppSettingsCommand.php
View File

@ -118,7 +118,7 @@ class AppSettingsCommand extends Command
} }
if ($this->variables['QUEUE_CONNECTION'] !== 'sync') { if ($this->variables['QUEUE_CONNECTION'] !== 'sync') {
Artisan::call('p:environment:queue-service', [ $this->call('p:environment:queue-service', [
'--use-redis' => $redisUsed, '--use-redis' => $redisUsed,
]); ]);
} }

36
app/Console/Commands/Environment/QueueWorkerServiceCommand.php
View File

@ -19,17 +19,18 @@ class QueueWorkerServiceCommand extends Command
public function handle(): void public function handle(): void
{ {
$serviceName = $this->option('service-name') ?? $this->ask('Service name', 'pelican-queue'); $serviceName = $this->option('service-name') ?? $this->ask('Queue worker service name', 'pelican-queue');
$path = '/etc/systemd/system/' . $serviceName . '.service'; $path = '/etc/systemd/system/' . $serviceName . '.service';
if (file_exists($path) && !$this->option('overwrite') && !$this->confirm('The service file already exists. Do you want to overwrite it?')) { $fileExists = file_exists($path);
$this->line('Creation of queue worker service file aborted.'); if ($fileExists && !$this->option('overwrite') && !$this->confirm('The service file already exists. Do you want to overwrite it?')) {
$this->line('Creation of queue worker service file aborted because serive file already exists.');
return; return;
} }
$user = $this->option('user') ?? $this->ask('User', 'www-data'); $user = $this->option('user') ?? $this->ask('Webserver User', 'www-data');
$group = $this->option('group') ?? $this->ask('Group', 'www-data'); $group = $this->option('group') ?? $this->ask('Webserver Group', 'www-data');
$afterRedis = $this->option('use-redis') ? '\nAfter=redis-server.service' : ''; $afterRedis = $this->option('use-redis') ? '\nAfter=redis-server.service' : '';
@ -45,7 +46,7 @@ Description=Pelican Queue Service$afterRedis
User=$user User=$user
Group=$group Group=$group
Restart=always Restart=always
ExecStart=/usr/bin/php $basePath/artisan queue:work --queue=high,standard,low --tries=3 ExecStart=/usr/bin/php $basePath/artisan queue:work --tries=3
StartLimitInterval=180 StartLimitInterval=180
StartLimitBurst=30 StartLimitBurst=30
RestartSec=5s RestartSec=5s
@ -60,13 +61,24 @@ WantedBy=multi-user.target
return; return;
} }
$result = Process::run("systemctl enable --now $serviceName.service"); if ($fileExists) {
if ($result->failed()) { $result = Process::run("systemctl restart $serviceName.service");
$this->error('Error enabling service: ' . $result->errorOutput()); if ($result->failed()) {
$this->error('Error restarting service: ' . $result->errorOutput());
return; return;
}
$this->line('Queue worker service file updated successfully.');
} else {
$result = Process::run("systemctl enable --now $serviceName.service");
if ($result->failed()) {
$this->error('Error enabling service: ' . $result->errorOutput());
return;
}
$this->line('Queue worker service file created successfully.');
} }
$this->line('Queue worker service file created successfully.');
} }
} }