mirror of
https://github.com/andres-montanez/Magallanes
synced 2024-06-20 22:45:05 +02:00
Cleanup for SensioLabs Insights.
This commit is contained in:
parent
2220b2fef5
commit
0f17468553
|
@ -24,8 +24,6 @@ use Exception;
|
||||||
*/
|
*/
|
||||||
class ReleasesCommand extends AbstractCommand implements RequiresEnvironment
|
class ReleasesCommand extends AbstractCommand implements RequiresEnvironment
|
||||||
{
|
{
|
||||||
private $release = null;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List the Releases, Rollback to a Release
|
* List the Releases, Rollback to a Release
|
||||||
* @see \Mage\Command\AbstractCommand::run()
|
* @see \Mage\Command\AbstractCommand::run()
|
||||||
|
@ -66,5 +64,7 @@ class ReleasesCommand extends AbstractCommand implements RequiresEnvironment
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
namespace Mage\Command;
|
namespace Mage\Command;
|
||||||
|
|
||||||
|
use Mage\Command\AbstractCommand;
|
||||||
use Mage\Config;
|
use Mage\Config;
|
||||||
use Mage\Autoload;
|
use Mage\Autoload;
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,11 @@
|
||||||
|
|
||||||
namespace Mage;
|
namespace Mage;
|
||||||
|
|
||||||
|
use Mage\Config;
|
||||||
|
use Mage\Command\Factory;
|
||||||
|
use Mage\Command\RequiresEnvironment;
|
||||||
|
use Mage\Console\Colors;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use RecursiveDirectoryIterator;
|
use RecursiveDirectoryIterator;
|
||||||
|
|
||||||
|
@ -78,7 +83,6 @@ class Console
|
||||||
// Load Config
|
// Load Config
|
||||||
$config = self::$config = new Config;
|
$config = self::$config = new Config;
|
||||||
$config->load($arguments);
|
$config->load($arguments);
|
||||||
$configLoadedOk = true;
|
|
||||||
|
|
||||||
} catch (Exception $exception) {
|
} catch (Exception $exception) {
|
||||||
$configError = $exception->getMessage();
|
$configError = $exception->getMessage();
|
||||||
|
@ -108,9 +112,9 @@ class Console
|
||||||
} else {
|
} else {
|
||||||
// Run Command and check for Command Requirements
|
// Run Command and check for Command Requirements
|
||||||
try {
|
try {
|
||||||
$command = Command\Factory::get($commandName, $config);
|
$command = Factory::get($commandName, $config);
|
||||||
|
|
||||||
if ($command instanceOf Command\RequiresEnvironment) {
|
if ($command instanceOf RequiresEnvironment) {
|
||||||
if ($config->getEnvironment() == false) {
|
if ($config->getEnvironment() == false) {
|
||||||
throw new Exception('You must specify an environment for this command.');
|
throw new Exception('You must specify an environment for this command.');
|
||||||
}
|
}
|
||||||
|
@ -149,7 +153,7 @@ class Console
|
||||||
. str_repeat(PHP_EOL, $newLine);
|
. str_repeat(PHP_EOL, $newLine);
|
||||||
|
|
||||||
$output = str_repeat("\t", $tabs)
|
$output = str_repeat("\t", $tabs)
|
||||||
. Console\Colors::color($message, self::$config)
|
. Colors::color($message, self::$config)
|
||||||
. str_repeat(PHP_EOL, $newLine);
|
. str_repeat(PHP_EOL, $newLine);
|
||||||
|
|
||||||
echo $output;
|
echo $output;
|
||||||
|
@ -187,9 +191,8 @@ class Console
|
||||||
* Log a message to the logfile.
|
* Log a message to the logfile.
|
||||||
*
|
*
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param boolean $continuation
|
|
||||||
*/
|
*/
|
||||||
public static function log($message, $continuation = false)
|
public static function log($message)
|
||||||
{
|
{
|
||||||
if (self::$logEnabled) {
|
if (self::$logEnabled) {
|
||||||
if (self::$log == null) {
|
if (self::$log == null) {
|
||||||
|
|
|
@ -87,6 +87,6 @@ class Mailer
|
||||||
. '--Mage-mixed-' . $boundary . '--' . self::EOL
|
. '--Mage-mixed-' . $boundary . '--' . self::EOL
|
||||||
;
|
;
|
||||||
|
|
||||||
$mail_sent = @mail($this->address, $subject, $message, $headers);
|
@mail($this->address, $subject, $message, $headers);
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -49,17 +49,21 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
|
||||||
$currentCopy = $releasesDirectory . '/' . $this->getConfig()->getReleaseId();
|
$currentCopy = $releasesDirectory . '/' . $this->getConfig()->getReleaseId();
|
||||||
|
|
||||||
// Fetch the user and group from base directory; defaults usergroup to 33:33
|
// 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);
|
$resultFetch = $this->runCommandRemote('ls -ld . | awk \'{print \$3":"\$4}\'', $userGroup);
|
||||||
|
|
||||||
// Remove symlink if exists; create new symlink and change owners
|
// Remove symlink if exists; create new symlink and change owners
|
||||||
$command = 'rm -f ' . $symlink
|
$command = 'rm -f ' . $symlink
|
||||||
. ' ; '
|
. ' ; '
|
||||||
. 'ln -sf ' . $currentCopy . ' ' . $symlink
|
. 'ln -sf ' . $currentCopy . ' ' . $symlink;
|
||||||
. ' && '
|
|
||||||
. 'chown -h ' . $userGroup . ' ' . $symlink
|
if ($resultFetch && $userGroup != '') {
|
||||||
. ' && '
|
$command .= ' && '
|
||||||
. 'chown -R ' . $userGroup . ' ' . $currentCopy;
|
. 'chown -h ' . $userGroup . ' ' . $symlink
|
||||||
|
. ' && '
|
||||||
|
. 'chown -R ' . $userGroup . ' ' . $currentCopy;
|
||||||
|
}
|
||||||
|
|
||||||
$result = $this->runCommandRemote($command);
|
$result = $this->runCommandRemote($command);
|
||||||
|
|
||||||
// Set Directory Releases to same owner
|
// Set Directory Releases to same owner
|
||||||
|
|
|
@ -50,7 +50,7 @@ class RsyncTask extends AbstractTask implements IsReleaseAware
|
||||||
if ($overrideRelease == true) {
|
if ($overrideRelease == true) {
|
||||||
$releaseToOverride = false;
|
$releaseToOverride = false;
|
||||||
$resultFetch = $this->runCommandRemote('ls -ld current | cut -d"/" -f2', $releaseToOverride);
|
$resultFetch = $this->runCommandRemote('ls -ld current | cut -d"/" -f2', $releaseToOverride);
|
||||||
if (is_numeric($releaseToOverride)) {
|
if ($resultFetch && is_numeric($releaseToOverride)) {
|
||||||
$this->getConfig()->setReleaseId($releaseToOverride);
|
$this->getConfig()->setReleaseId($releaseToOverride);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,7 @@ class RsyncTask extends AbstractTask implements IsReleaseAware
|
||||||
$countReleasesFetch = $this->runCommandRemote('ls -1 ' . $releasesDirectory, $releasesList);
|
$countReleasesFetch = $this->runCommandRemote('ls -1 ' . $releasesDirectory, $releasesList);
|
||||||
$releasesList = trim($releasesList);
|
$releasesList = trim($releasesList);
|
||||||
|
|
||||||
if ($releasesList != '') {
|
if ($countReleasesFetch && $releasesList != '') {
|
||||||
$releasesList = explode(PHP_EOL, $releasesList);
|
$releasesList = explode(PHP_EOL, $releasesList);
|
||||||
if (count($releasesList) > $maxReleases) {
|
if (count($releasesList) > $maxReleases) {
|
||||||
$releasesToDelete = array_diff($releasesList, array($this->getConfig()->getReleaseId()));
|
$releasesToDelete = array_diff($releasesList, array($this->getConfig()->getReleaseId()));
|
||||||
|
|
|
@ -50,7 +50,7 @@ class TarGzTask extends AbstractTask implements IsReleaseAware
|
||||||
if ($overrideRelease == true) {
|
if ($overrideRelease == true) {
|
||||||
$releaseToOverride = false;
|
$releaseToOverride = false;
|
||||||
$resultFetch = $this->runCommandRemote('ls -ld current | cut -d"/" -f2', $releaseToOverride);
|
$resultFetch = $this->runCommandRemote('ls -ld current | cut -d"/" -f2', $releaseToOverride);
|
||||||
if (is_numeric($releaseToOverride)) {
|
if ($resultFetch && is_numeric($releaseToOverride)) {
|
||||||
$this->getConfig()->setReleaseId($releaseToOverride);
|
$this->getConfig()->setReleaseId($releaseToOverride);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -136,7 +136,7 @@ class TarGzTask extends AbstractTask implements IsReleaseAware
|
||||||
$countReleasesFetch = $this->runCommandRemote('ls -1 ' . $releasesDirectory, $releasesList);
|
$countReleasesFetch = $this->runCommandRemote('ls -1 ' . $releasesDirectory, $releasesList);
|
||||||
$releasesList = trim($releasesList);
|
$releasesList = trim($releasesList);
|
||||||
|
|
||||||
if ($releasesList != '') {
|
if ($countReleasesFetch && $releasesList != '') {
|
||||||
$releasesList = explode(PHP_EOL, $releasesList);
|
$releasesList = explode(PHP_EOL, $releasesList);
|
||||||
if (count($releasesList) > $maxReleases) {
|
if (count($releasesList) > $maxReleases) {
|
||||||
$releasesToDelete = array_diff($releasesList, array($this->getConfig()->getReleaseId()));
|
$releasesToDelete = array_diff($releasesList, array($this->getConfig()->getReleaseId()));
|
||||||
|
|
|
@ -138,9 +138,12 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
|
||||||
$resultFetch = $this->runCommandRemote('ls -ld ' . $rollbackTo . ' | awk \'{print \$3":"\$4}\'', $userGroup);
|
$resultFetch = $this->runCommandRemote('ls -ld ' . $rollbackTo . ' | awk \'{print \$3":"\$4}\'', $userGroup);
|
||||||
$command = 'rm -f ' . $symlink
|
$command = 'rm -f ' . $symlink
|
||||||
. ' && '
|
. ' && '
|
||||||
. 'ln -sf ' . $rollbackTo . ' ' . $symlink
|
. 'ln -sf ' . $rollbackTo . ' ' . $symlink;
|
||||||
. ' && '
|
|
||||||
. 'chown -h ' . $userGroup . ' ' . $symlink;
|
if ($resultFetch) {
|
||||||
|
$command .= ' && chown -h ' . $userGroup . ' ' . $symlink;
|
||||||
|
}
|
||||||
|
|
||||||
$result = $this->runCommandRemote($command);
|
$result = $this->runCommandRemote($command);
|
||||||
|
|
||||||
if ($result) {
|
if ($result) {
|
||||||
|
|
|
@ -13,6 +13,7 @@ namespace Mage\Task;
|
||||||
use Mage\Config;
|
use Mage\Config;
|
||||||
use Mage\Autoload;
|
use Mage\Autoload;
|
||||||
use Mage\Task\ErrorWithMessageException;
|
use Mage\Task\ErrorWithMessageException;
|
||||||
|
use Mage\Task\AbstractTask;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue