revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-31 08:58:20 +01:00
Code Issues Releases Wiki Activity

Allow timeouts to be specified on Drydock SSH connections

Browse source 
Summary: This allows timeouts to be specified on SSH connections that Drydock makes.  Used in the EC2 allocator to poll for the SSH server starting.

Test Plan: Used in EC2 allocator diff.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D10225
This commit is contained in:
James Rhodes 2014-08-12 09:14:47 +10:00
parent e48aaa563a
commit d2111214f2
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
View file

@ -3,6 +3,7 @@
final class DrydockSSHCommandInterface extends DrydockCommandInterface { final class DrydockSSHCommandInterface extends DrydockCommandInterface {
private $passphraseSSHKey; private $passphraseSSHKey;
private $connectTimeout;
private function openCredentialsIfNotOpen() { private function openCredentialsIfNotOpen() {
if ($this->passphraseSSHKey !== null) { if ($this->passphraseSSHKey !== null) {
@ -25,6 +26,11 @@ final class DrydockSSHCommandInterface extends DrydockCommandInterface {
PhabricatorUser::getOmnipotentUser()); PhabricatorUser::getOmnipotentUser());
} }
public function setConnectTimeout($timeout) {
$this->connectTimeout = $timeout;
return $this;
}
public function getExecFuture($command) { public function getExecFuture($command) {
$this->openCredentialsIfNotOpen(); $this->openCredentialsIfNotOpen();
@ -44,8 +50,19 @@ final class DrydockSSHCommandInterface extends DrydockCommandInterface {
$full_command = 'C:\\Windows\\system32\\cmd.exe /C '.$full_command; $full_command = 'C:\\Windows\\system32\\cmd.exe /C '.$full_command;
} }
$command_timeout = '';
if ($this->connectTimeout !== null) {
$command_timeout = csprintf(
'-o %s',
'ConnectTimeout='.$this->connectTimeout);
}
return new ExecFuture( return new ExecFuture(
'ssh -o StrictHostKeyChecking=no -p %s -i %P %P@%s -- %s', 'ssh '.
'-o StrictHostKeyChecking=no '.
'-o BatchMode=yes '.
'%C -p %s -i %P %P@%s -- %s',
$command_timeout,
$this->getConfig('port'), $this->getConfig('port'),
$this->passphraseSSHKey->getKeyfileEnvelope(), $this->passphraseSSHKey->getKeyfileEnvelope(),
$this->passphraseSSHKey->getUsernameEnvelope(), $this->passphraseSSHKey->getUsernameEnvelope(),