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

Adding global try/catch in Builder, in hope of fixing forever-hanging. Closes #354, Closes #304

Browse source
This commit is contained in:
Dan Cryer 2014-04-16 09:05:46 +01:00
parent 12ccec53dc
commit 98aa35d159
1 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
PHPCI/Builder.php
View file

@ -188,41 +188,47 @@ class Builder implements LoggerAwareInterface
$this->build->sendStatusPostback();
$this->success = true;
// Set up the build:
$this->setupBuild();
try {
// Set up the build:
$this->setupBuild();
// Run the core plugin stages:
foreach (array('setup', 'test') as $stage) {
$this->success &= $this->pluginExecutor->executePlugins($this->config, $stage);
}
// Run the core plugin stages:
foreach (array('setup', 'test') as $stage) {
$this->success &= $this->pluginExecutor->executePlugins($this->config, $stage);
}
// Set the status so this can be used by complete, success and failure
// stages.
if ($this->success) {
$this->build->setStatus(Build::STATUS_SUCCESS);
} else {
// Set the status so this can be used by complete, success and failure
// stages.
if ($this->success) {
$this->build->setStatus(Build::STATUS_SUCCESS);
} else {
$this->build->setStatus(Build::STATUS_FAILED);
}
// Complete stage plugins are always run
$this->pluginExecutor->executePlugins($this->config, 'complete');
if ($this->success) {
$this->pluginExecutor->executePlugins($this->config, 'success');
$this->buildLogger->logSuccess('BUILD SUCCESSFUL!');
} else {
$this->pluginExecutor->executePlugins($this->config, 'failure');
$this->buildLogger->logFailure("BUILD FAILURE");
}
// Clean up:
$this->buildLogger->log('Removing build.');
$cmd = 'rm -Rf "%s"';
if (IS_WIN) {
$cmd = 'rmdir /S /Q "%s"';
}
$this->executeCommand($cmd, $this->buildPath);
} catch (\Exception $ex) {
$this->build->setStatus(Build::STATUS_FAILED);
$this->buildLogger->logFailure('Exception: ' . $ex->getMessage());
}
// Complete stage plugins are always run
$this->pluginExecutor->executePlugins($this->config, 'complete');
if ($this->success) {
$this->pluginExecutor->executePlugins($this->config, 'success');
$this->buildLogger->logSuccess('BUILD SUCCESSFUL!');
} else {
$this->pluginExecutor->executePlugins($this->config, 'failure');
$this->buildLogger->logFailure("BUILD FAILURE");
}
// Clean up:
$this->buildLogger->log('Removing build.');
$cmd = 'rm -Rf "%s"';
if (IS_WIN) {
$cmd = 'rmdir /S /Q "%s"';
}
$this->executeCommand($cmd, $this->buildPath);
// Update the build in the database, ping any external services, etc.
$this->build->sendStatusPostback();