deblan-mirror/magallanes
1
0
Fork 0
mirror of https://github.com/andres-montanez/Magallanes synced 2024-06-26 09:10:05 +02:00
Code Issues Projects Releases Wiki Activity

Make configurable tar timeout also impact the scp command from Tar/CopyTask.

Browse source
This commit is contained in:
Julien Galletta 2017-12-07 13:33:46 +01:00
parent 36d999dabc
commit 8baa1a01fd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Task/BuiltIn/Deploy/Tar/CopyTask.php
View file

@ -45,7 +45,7 @@ class CopyTask extends AbstractTask
$tarPath = $this->runtime->getEnvOption('tar_extract_path', 'tar');
$flags = $this->runtime->getEnvOption('tar_extract', 'xfzop');
$timeout = $this->runtime->getEnvOption('tar_timeout', 600);
$timeout = $this->runtime->getEnvOption('tar_timeout', 300);
$targetDir = sprintf('%s/releases/%s', $hostPath, $currentReleaseId);
$tarLocal = $this->runtime->getVar('tar_local');
@ -54,10 +54,10 @@ class CopyTask extends AbstractTask
$cmdCopy = sprintf('scp -P %d %s %s %s@%s:%s/%s', $sshConfig['port'], $sshConfig['flags'], $tarLocal, $user, $host, $targetDir, $tarRemote);
/** @var Process $process */
$process = $this->runtime->runLocalCommand($cmdCopy, 300);
$process = $this->runtime->runLocalCommand($cmdCopy, $timeout);
if ($process->isSuccessful()) {
$cmdUnTar = sprintf('cd %s && %s %s %s', $targetDir, $tarPath, $flags, $tarRemote);
$process = $this->runtime->runRemoteCommand($cmdUnTar, false, $timeout);
$process = $this->runtime->runRemoteCommand($cmdUnTar, false, $timeout + 300);
if ($process->isSuccessful()) {
$cmdDelete = sprintf('rm %s/%s', $targetDir, $tarRemote);
$process = $this->runtime->runRemoteCommand($cmdDelete, false);