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

Commands fixes

Browse source
This commit is contained in:
Dmitry Khomutov 2017-02-05 11:18:33 +07:00
commit ed532bad7d
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
24 changed files with 100 additions and 479 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/PHPCensor/Command/RunCommand.php
View file

@ -1,17 +1,9 @@
<?php
/**
* PHPCI - Continuous Integration for PHP
*
* @copyright Copyright 2014, Block 8 Limited.
* @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md
* @link https://www.phptesting.org/
*/
namespace PHPCensor\Command;
use b8\Config;
use Monolog\Logger;
use PHPCensor\Helper\Lang;
use PHPCensor\Logging\BuildDBLogHandler;
use PHPCensor\Logging\LoggedBuildContextTidier;
use PHPCensor\Logging\OutputLogHandler;
@ -27,9 +19,7 @@ use PHPCensor\Model\Build;
/**
* Run console command - Runs any pending builds.
*
* @author Dan Cryer <dan@block8.co.uk>
* @package PHPCI
* @subpackage Console
* @author Dan Cryer <dan@block8.co.uk>
*/
class RunCommand extends Command
{
@ -62,8 +52,8 @@ class RunCommand extends Command
{
$this
->setName('php-censor:run-builds')
->setDescription(Lang::get('run_all_pending'))
->addOption('debug', null, null, 'Run PHP Censor in Debug Mode');
->setDescription('Run all pending PHP Censor builds')
->addOption('debug', null, null, 'Run PHP Censor in debug mode');
}
/**
@ -90,13 +80,13 @@ class RunCommand extends Command
$running = $this->validateRunningBuilds();
$this->logger->pushProcessor(new LoggedBuildContextTidier());
$this->logger->addInfo(Lang::get('finding_builds'));
$this->logger->addInfo('Finding builds to process');
/** @var BuildStore $store */
$store = Factory::getStore('Build');
$result = $store->getByStatus(Build::STATUS_PENDING, $this->maxBuilds);
$this->logger->addInfo(Lang::get('found_n_builds', count($result['items'])));
$this->logger->addInfo(sprintf('Found %d builds', count($result['items'])));
$builds = 0;
@ -106,7 +96,7 @@ class RunCommand extends Command
// Skip build (for now) if there's already a build running in that project:
if (in_array($build->getProjectId(), $running)) {
$this->logger->addInfo(Lang::get('skipping_build', $build->getId()));
$this->logger->addInfo(sprintf('Skipping Build %d - Project build already in progress.', $build->getId()));
$result['items'][] = $build;
// Re-run build validator:
@ -137,7 +127,7 @@ class RunCommand extends Command
}
$this->logger->addInfo(Lang::get('finished_processing_builds'));
$this->logger->addInfo('Finished processing builds.');
return $builds;
}
@ -164,7 +154,7 @@ class RunCommand extends Command
$start = $build->getStarted()->getTimestamp();
if (($now - $start) > $timeout) {
$this->logger->addInfo(Lang::get('marked_as_failed', $build->getId()));
$this->logger->addInfo(sprintf('Build %d marked as failed due to timeout.', $build->getId()));
$build->setStatus(Build::STATUS_FAILED);
$build->setFinished(new \DateTime());
$store->save($build);