diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Process] Add workaround for PHP's internal sigchild failing to return proper exit codes

This commit is contained in:
Jordi Boggiano 2012-08-26 15:13:51 +02:00
parent 2c0e851059
commit 7b63428698
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Symfony/Component/Process/Process.php
View File

@ -39,6 +39,7 @@ class Process
private $timeout; private $timeout;
private $options; private $options;
private $exitcode; private $exitcode;
private $fallbackExitcode;
private $processInformation; private $processInformation;
private $stdout; private $stdout;
private $stderr; private $stderr;
@ -211,7 +212,13 @@ class Process
); );
$descriptors = array(array('pipe', 'r'), $this->fileHandles[self::STDOUT], array('pipe', 'w')); $descriptors = array(array('pipe', 'r'), $this->fileHandles[self::STDOUT], array('pipe', 'w'));
} else { } else {
$descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w')); $descriptors = array(
array('pipe', 'r'), // stdin
array('pipe', 'w'), // stdout
array('pipe', 'w'), // stderr
array('pipe', 'w') // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
);
$this->commandline = '('.$this->commandline.') 3>/dev/null; echo $? >&3';
} }
$commandline = $this->commandline; $commandline = $this->commandline;
@ -336,8 +343,14 @@ class Process
foreach ($r as $pipe) { foreach ($r as $pipe) {
$type = array_search($pipe, $this->pipes); $type = array_search($pipe, $this->pipes);
$data = fread($pipe, 8192); $data = fread($pipe, 8192);
if (strlen($data) > 0) { if (strlen($data) > 0) {
call_user_func($callback, $type == 1 ? self::OUT : self::ERR, $data); // last exit code is output and caught to work around --enable-sigchild
if (3 == $type) {
$this->fallbackExitcode = (int) $data;
} else {
call_user_func($callback, $type == 1 ? self::OUT : self::ERR, $data);
}
} }
if (false === $data || feof($pipe)) { if (false === $data || feof($pipe)) {
fclose($pipe); fclose($pipe);
@ -363,7 +376,13 @@ class Process
throw new \RuntimeException(sprintf('The process stopped because of a "%s" signal.', $this->processInformation['stopsig'])); throw new \RuntimeException(sprintf('The process stopped because of a "%s" signal.', $this->processInformation['stopsig']));
} }
return $this->exitcode = $this->processInformation['running'] ? $exitcode : $this->processInformation['exitcode']; $this->exitcode = $this->processInformation['running'] ? $exitcode : $this->processInformation['exitcode'];
if (-1 == $this->exitcode && null !== $this->fallbackExitcode) {
$this->exitcode = $this->fallbackExitcode;
}
return $this->exitcode;
} }
/** /**