Merge pull request #247 from raistlin/Fix_Daemonise

Fix daemonise

PHPCI/Command/DaemoniseCommand.php

@@ -10,14 +10,13 @@
 
 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;
 use Symfony\Component\Console\Output\OutputInterface;
-use b8\Store\Factory;
-use PHPCI\Builder;
-use PHPCI\BuildFactory;
 
 /**
 * Daemon that loops and call the run-command.
@@ -27,6 +26,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 +62,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);
             }

PHPCI/Command/RunCommand.php

@@ -68,7 +68,7 @@ class RunCommand extends Command
 
         // For verbose mode we want to output all informational and above
         // messages to the symphony output interface.
-        if ($input->getOption('verbose')) {
+        if ($input->hasOption('verbose')) {
             $this->logger->pushHandler(
                 new OutputLogHandler($this->output, Logger::INFO)
             );

daemonise

@@ -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();