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

Bug fixes

Browse source 
Signed-off-by: Dan Cryer <dan@block8.co.uk>
This commit is contained in:
Dan Cryer 2016-06-23 11:28:42 +01:00
commit b536f972c2
7 changed files with 71 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
PHPCI/Service/BuildService.php
View file

@ -30,6 +30,11 @@ class BuildService
*/
protected $buildStore;
/**
* @var bool
*/
public $queueError = false;
/**
* @param BuildStore $buildStore
*/
@ -155,27 +160,30 @@ class BuildService
}
$config = Config::getInstance();
$settings = $config->get('phpci.worker', []);
if (!empty($settings['host']) && !empty($settings['queue'])) {
$jobData = array(
'type' => 'phpci.build',
'build_id' => $build->getId(),
);
try {
$jobData = array(
'type' => 'phpci.build',
'build_id' => $build->getId(),
);
if ($config->get('using_custom_file')) {
$jobData['config'] = $config->getArray();
if ($config->get('using_custom_file')) {
$jobData['config'] = $config->getArray();
}
$pheanstalk = new Pheanstalk($settings['host']);
$pheanstalk->useTube($settings['queue']);
$pheanstalk->put(
json_encode($jobData),
PheanstalkInterface::DEFAULT_PRIORITY,
PheanstalkInterface::DEFAULT_DELAY,
$config->get('phpci.worker.job_timeout', 600)
);
} catch (\Exception $ex) {
$this->queueError = true;
}
$pheanstalk = new Pheanstalk($settings['host']);
$pheanstalk->useTube($settings['queue']);
$pheanstalk->put(
json_encode($jobData),
PheanstalkInterface::DEFAULT_PRIORITY,
PheanstalkInterface::DEFAULT_DELAY,
$config->get('phpci.worker.job_timeout', 600)
);
}
}
}