Merge pull request #177 from MovingImage24/connect_timeout

Add config option to set ConnectTimeout for ssh connections

Mage/Config.php

@@ -391,6 +391,16 @@ class Config
         return $this->deployment('identity-file') ? ('-i ' . $this->deployment('identity-file') . ' ') : '';
     }
 
+    /**
+     * Get the ConnectTimeout option
+     *
+     * @return string
+     */
+    public function getConnectTimeoutOption()
+    {
+        return $this->environmentConfig('connect-timeout') ? ('-o ConnectTimeout=' . $this->environmentConfig('connect-timeout') . ' ') : '';
+    }
+
     /**
      * Get the current Host
      *

Mage/Task/AbstractTask.php

@@ -201,6 +201,7 @@ abstract class AbstractTask
 
         $localCommand = 'ssh ' . $this->getConfig()->getHostIdentityFileOption() . $needs_tty . ' -p ' . $this->getConfig()->getHostPort() . ' '
             . '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '
+            . $this->getConfig()->getConnectTimeoutOption()
             . $this->getConfig()->deployment('user') . '@' . $this->getConfig()->getHostName();
 
         $remoteCommand = str_replace('"', '\"', $command);

Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php

@@ -89,7 +89,7 @@ class TarGzTask extends BaseStrategyTaskAbstract implements IsReleaseAware
         }
 
         // Copy Tar Gz  to Remote Host
-        $command = 'scp ' . $strategyFlags . ' ' . $this->getConfig()->getHostIdentityFileOption() . '-P ' . $this->getConfig()->getHostPort() . ' ' . $localTarGz . '.tar.gz '
+        $command = 'scp ' . $strategyFlags . ' ' . $this->getConfig()->getHostIdentityFileOption() . $this->getConfig()->getConnectTimeoutOption() . '-P ' . $this->getConfig()->getHostPort() . ' ' . $localTarGz . '.tar.gz '
                  . $this->getConfig()->deployment('user') . '@' . $this->getConfig()->getHostName() . ':' . $deployToDirectory;
         $result = $this->runCommandLocal($command) && $result;