Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fixes for SmartOS / Solaris #293

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −2
Open

Fixes for SmartOS / Solaris #293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions lib/Resque/Worker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,13 @@ public function killChild()
}

$this->logger->log(Psr\Log\LogLevel::INFO, 'Killing child at {child}', array('child' => $this->child));
if(exec('ps -o pid,state -p ' . $this->child, $output, $returnCode) && $returnCode != 1) {
if ('SunOS' == PHP_OS) {
$cmd = 'ps -o pid,s -p';
} else {
$cmd = 'ps -o pid,state -p';
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The SunOS variant is actually the standard version, so switching to it completely seems the better approach. Same justification as for ps -A -o pid,args, below.

if(exec($cmd . ' ' . $this->child, $output, $returnCode) && $returnCode != 1) {
$this->logger->log(Psr\Log\LogLevel::DEBUG, 'Child {child} found, killing.', array('child' => $this->child));
posix_kill($this->child, SIGKILL);
$this->child = null;
Expand Down Expand Up @@ -454,7 +460,14 @@ public function pruneDeadWorkers()
public function workerPids()
{
$pids = array();
exec('ps -A -o pid,command | grep [r]esque', $cmdOutput);

if ('SunOS' == PHP_OS) {
$cmd = 'ps -A -o pid,comm';
} else {
$cmd = 'ps -A -o pid,command';
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed in #139 (comment), it would probably be better to use ps -A -o pid,args here instead of switching commands based on platform...

exec($cmd . ' | grep [r]esque', $cmdOutput);
foreach($cmdOutput as $line) {
list($pids[],) = explode(' ', trim($line), 2);
}
Expand Down