deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix daemonise crash.

Browse source
This commit is contained in:
Raul Ferriz 2014-01-04 10:19:55 +01:00
parent 8bc043065a
commit 4b50b9eb77
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
PHPCI/Command/DaemoniseCommand.php
View file

@ -10,7 +10,9 @@
namespace PHPCI\Command;
use Monolog\Logger;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
@ -27,6 +29,26 @@ use PHPCI\BuildFactory;
*/
class DaemoniseCommand extends Command
{
/**
* @var Logger
*/
protected $logger;
/**
* @var OutputInterface
*/
protected $output;
/**
* @param \Monolog\Logger $logger
* @param string $name
*/
public function __construct(Logger $logger, $name = null)
{
parent::__construct($name);
$this->logger = $logger;
}
protected function configure()
{
$this
@ -43,14 +65,19 @@ class DaemoniseCommand extends Command
$command = sprintf($cmd, getmypid(), PHPCI_DIR);
exec($command);
$this->output = $output;
$this->run = true;
$this->sleep = 0;
$runner = new RunCommand;
$runner = new RunCommand($this->logger);
$in = new ArgvInput(array());
while ($this->run) {
$buildCount = 0;
try {
$buildCount = $runner->execute($input, $output);
$buildCount = $runner->run($in, $output);
} catch (\Exception $e) {
var_dump($e);
}

4
daemonise
View file

@ -15,6 +15,8 @@ require('bootstrap.php');
use PHPCI\Command\DaemoniseCommand;
use Symfony\Component\Console\Application;
$loggerConfig = \PHPCI\Helper\LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php");
$application = new Application();
$application->add(new DaemoniseCommand);
$application->add(new DaemoniseCommand($loggerConfig->getFor('DaemoniseCommand')));
$application->run();