-
Notifications
You must be signed in to change notification settings - Fork 645
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[5.x] Add commands to pause and continue supervisors #914
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
<?php | ||
|
||
namespace Laravel\Horizon\Console; | ||
|
||
use Illuminate\Console\Command; | ||
use Illuminate\Support\Str; | ||
use Laravel\Horizon\Contracts\SupervisorRepository; | ||
use Laravel\Horizon\MasterSupervisor; | ||
|
||
class ContinueSupervisorCommand extends Command | ||
{ | ||
/** | ||
* The name and signature of the console command. | ||
* | ||
* @var string | ||
*/ | ||
protected $signature = 'horizon:continue-supervisor | ||
{name : The name of the supervisor to resume}'; | ||
|
||
/** | ||
* The console command description. | ||
* | ||
* @var string | ||
*/ | ||
protected $description = 'Instruct the supervisor to continue processing jobs'; | ||
|
||
/** | ||
* Execute the console command. | ||
* | ||
* @param \Laravel\Horizon\Contracts\SupervisorRepository $supervisors | ||
* @return void | ||
*/ | ||
public function handle(SupervisorRepository $supervisors) | ||
{ | ||
$processId = optional(collect($supervisors->all())->first(function ($supervisor) { | ||
return Str::startsWith($supervisor->name, MasterSupervisor::basename()) | ||
&& Str::endsWith($supervisor->name, $this->argument('name')); | ||
}))->pid; | ||
|
||
if (is_null($processId)) { | ||
$this->error('Failed to find a supervisor with this name'); | ||
|
||
return 1; | ||
} | ||
|
||
$this->info("Sending CONT Signal To Process: {$processId}"); | ||
|
||
if (! posix_kill($processId, SIGCONT)) { | ||
$this->error("Failed to kill process: {$processId} (".posix_strerror(posix_get_last_error()).')'); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
<?php | ||
|
||
namespace Laravel\Horizon\Console; | ||
|
||
use Illuminate\Console\Command; | ||
use Illuminate\Support\Str; | ||
use Laravel\Horizon\Contracts\SupervisorRepository; | ||
use Laravel\Horizon\MasterSupervisor; | ||
|
||
class PauseSupervisorCommand extends Command | ||
{ | ||
/** | ||
* The name and signature of the console command. | ||
* | ||
* @var string | ||
*/ | ||
protected $signature = 'horizon:pause-supervisor | ||
{name : The name of the supervisor to pause}'; | ||
|
||
/** | ||
* The console command description. | ||
* | ||
* @var string | ||
*/ | ||
protected $description = 'Pause a supervisor'; | ||
|
||
/** | ||
* Execute the console command. | ||
* | ||
* @param \Laravel\Horizon\Contracts\SupervisorRepository $supervisors | ||
* @return void | ||
*/ | ||
public function handle(SupervisorRepository $supervisors) | ||
{ | ||
$processId = optional(collect($supervisors->all())->first(function ($supervisor) { | ||
return Str::startsWith($supervisor->name, MasterSupervisor::basename()) | ||
&& Str::endsWith($supervisor->name, $this->argument('name')); | ||
}))->pid; | ||
|
||
if (is_null($processId)) { | ||
$this->error('Failed to find a supervisor with this name'); | ||
|
||
return 1; | ||
} | ||
|
||
$this->info("Sending USR2 Signal To Process: {$processId}"); | ||
|
||
if (! posix_kill($processId, SIGUSR2)) { | ||
$this->error("Failed to kill process: {$processId} (".posix_strerror(posix_get_last_error()).')'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Basically the same feedback, something like "Cant send signal SIGUSR2 to…" 🤔 |
||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a small feedback that this is not what's happening from the user perspective: we're not trying to send SIGKILL or SIGTERM here, maybe it should be rephrased to "Cant send signal SIGCONT to…" or so?