hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2026-08-28 10:08:56 +02:00
Code Issues Releases Wiki Activity

Cleanup for SensioLabs Insights.

Browse Source
This commit is contained in:
Andrés Montañez
2013-12-19 15:37:26 -02:00
parent 2220b2fef5
commit 0f17468553
9 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mage/Task/BuiltIn/Deployment/ReleaseTask.php
+10 -6
View File
@@ -49,17 +49,21 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
$currentCopy = $releasesDirectory . '/' . $this->getConfig()->getReleaseId();
// Fetch the user and group from base directory; defaults usergroup to 33:33
$userGroup = '33:33';
$userGroup = '';
$resultFetch = $this->runCommandRemote('ls -ld . | awk \'{print \$3":"\$4}\'', $userGroup);
// Remove symlink if exists; create new symlink and change owners
$command = 'rm -f ' . $symlink
. ' ; '
. 'ln -sf ' . $currentCopy . ' ' . $symlink
. ' && '
. 'chown -h ' . $userGroup . ' ' . $symlink
. ' && '
. 'chown -R ' . $userGroup . ' ' . $currentCopy;
. 'ln -sf ' . $currentCopy . ' ' . $symlink;
if ($resultFetch && $userGroup != '') {
$command .= ' && '
. 'chown -h ' . $userGroup . ' ' . $symlink
. ' && '
. 'chown -R ' . $userGroup . ' ' . $currentCopy;
}
$result = $this->runCommandRemote($command);
// Set Directory Releases to same owner
Mage/Task/BuiltIn/Deployment/Strategy/RsyncTask.php
+2 -2
View File
@@ -50,7 +50,7 @@ class RsyncTask extends AbstractTask implements IsReleaseAware
if ($overrideRelease == true) {
$releaseToOverride = false;
$resultFetch = $this->runCommandRemote('ls -ld current | cut -d"/" -f2', $releaseToOverride);
if (is_numeric($releaseToOverride)) {
if ($resultFetch && is_numeric($releaseToOverride)) {
$this->getConfig()->setReleaseId($releaseToOverride);
}
}
@@ -101,7 +101,7 @@ class RsyncTask extends AbstractTask implements IsReleaseAware
$countReleasesFetch = $this->runCommandRemote('ls -1 ' . $releasesDirectory, $releasesList);
$releasesList = trim($releasesList);
if ($releasesList != '') {
if ($countReleasesFetch && $releasesList != '') {
$releasesList = explode(PHP_EOL, $releasesList);
if (count($releasesList) > $maxReleases) {
$releasesToDelete = array_diff($releasesList, array($this->getConfig()->getReleaseId()));
Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php
+2 -2
View File
@@ -50,7 +50,7 @@ class TarGzTask extends AbstractTask implements IsReleaseAware
if ($overrideRelease == true) {
$releaseToOverride = false;
$resultFetch = $this->runCommandRemote('ls -ld current | cut -d"/" -f2', $releaseToOverride);
if (is_numeric($releaseToOverride)) {
if ($resultFetch && is_numeric($releaseToOverride)) {
$this->getConfig()->setReleaseId($releaseToOverride);
}
}
@@ -136,7 +136,7 @@ class TarGzTask extends AbstractTask implements IsReleaseAware
$countReleasesFetch = $this->runCommandRemote('ls -1 ' . $releasesDirectory, $releasesList);
$releasesList = trim($releasesList);
if ($releasesList != '') {
if ($countReleasesFetch && $releasesList != '') {
$releasesList = explode(PHP_EOL, $releasesList);
if (count($releasesList) > $maxReleases) {
$releasesToDelete = array_diff($releasesList, array($this->getConfig()->getReleaseId()));
Mage/Task/BuiltIn/Releases/RollbackTask.php
+6 -3
View File
@@ -138,9 +138,12 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
$resultFetch = $this->runCommandRemote('ls -ld ' . $rollbackTo . ' | awk \'{print \$3":"\$4}\'', $userGroup);
$command = 'rm -f ' . $symlink
. ' && '
. 'ln -sf ' . $rollbackTo . ' ' . $symlink
. ' && '
. 'chown -h ' . $userGroup . ' ' . $symlink;
. 'ln -sf ' . $rollbackTo . ' ' . $symlink;
if ($resultFetch) {
$command .= ' && chown -h ' . $userGroup . ' ' . $symlink;
}
$result = $this->runCommandRemote($command);
if ($result) {
Mage/Task/Factory.php
+1
View File
@@ -13,6 +13,7 @@ namespace Mage\Task;
use Mage\Config;
use Mage\Autoload;
use Mage\Task\ErrorWithMessageException;
use Mage\Task\AbstractTask;
use Exception;