deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updating the CommandExecutor::executeCommand() method to properly catch stderr output from commands.

Browse source 
Fixes #456
This commit is contained in:
Dan Cryer 2014-07-30 13:34:45 +01:00
parent a89f686372
commit d798b5f672
1 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
PHPCI/Helper/BaseCommandExecutor.php
View file

@ -30,6 +30,7 @@ abstract class BaseCommandExecutor implements CommandExecutor
protected $verbose;
protected $lastOutput;
protected $lastError;
public $logExecOutput = true;
@ -78,16 +79,42 @@ abstract class BaseCommandExecutor implements CommandExecutor
}
$status = 0;
exec($command, $this->lastOutput, $status);
$descriptorSpec = array(
0 => array("pipe", "r"), // stdin
1 => array("pipe", "w"), // stdout
2 => array("pipe", "w"), // stderr
);
foreach ($this->lastOutput as &$lastOutput) {
$lastOutput = trim($lastOutput, '"');
$pipes = array();
$process = proc_open($command, $descriptorSpec, $pipes, dirname($this->buildPath), null);
if (is_resource($process)) {
fclose($pipes[0]);
$this->lastOutput = stream_get_contents($pipes[1]);
$this->lastError = stream_get_contents($pipes[2]);
fclose($pipes[1]);
fclose($pipes[2]);
$status = proc_close($process);
}
if ($this->logExecOutput && !empty($this->lastOutput) && ($this->verbose|| $status != 0)) {
$this->lastOutput = explode(PHP_EOL, $this->lastOutput);
$this->lastError = "\033[0;31m" . $this->lastError . "\033[0m";
$shouldOutput = ($this->logExecOutput && ($this->verbose || $status != 0));
if ($shouldOutput && !empty($this->lastOutput)) {
$this->logger->log($this->lastOutput);
}
if (!empty($this->lastError)) {
$this->logger->log('Error trying to execute: ' . $command);
$this->logger->log($this->lastError, LogLevel::ERROR);
}
$rtn = false;
if ($status == 0) {