iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

communicator/ssh: re-establish ssh connection if possible [GH-152]

This commit is contained in:
Mitchell Hashimoto 2013-07-14 20:55:02 +09:00
parent 04463f8254
commit 020e719e92
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
communicator/ssh/communicator.go
View File

@ -46,7 +46,7 @@ func New(config *Config) (result *comm, err error) {
} }
func (c *comm) Start(cmd *packer.RemoteCmd) (err error) { func (c *comm) Start(cmd *packer.RemoteCmd) (err error) {
session, err := c.client.NewSession() session, err := c.newSession()
if err != nil { if err != nil {
return return
} }
@ -77,7 +77,6 @@ func (c *comm) Start(cmd *packer.RemoteCmd) (err error) {
// exit boolean and status. // exit boolean and status.
go func() { go func() {
defer session.Close() defer session.Close()
err := session.Wait() err := session.Wait()
cmd.ExitStatus = 0 cmd.ExitStatus = 0
if err != nil { if err != nil {
@ -94,8 +93,7 @@ func (c *comm) Start(cmd *packer.RemoteCmd) (err error) {
} }
func (c *comm) Upload(path string, input io.Reader) error { func (c *comm) Upload(path string, input io.Reader) error {
log.Println("Opening new SSH session") session, err := c.newSession()
session, err := c.client.NewSession()
if err != nil { if err != nil {
return err return err
} }
@ -190,16 +188,37 @@ func (c *comm) Download(string, io.Writer) error {
panic("not implemented yet") panic("not implemented yet")
} }
func (c *comm) newSession() (*ssh.Session, error) {
log.Println("opening new ssh session")
session, err := c.client.NewSession()
if err != nil {
if err := c.reconnect(); err != nil {
return nil, err
}
return c.client.NewSession()
}
return session, nil
}
func (c *comm) reconnect() (err error) { func (c *comm) reconnect() (err error) {
if c.conn != nil { if c.conn != nil {
c.conn.Close() c.conn.Close()
} }
log.Printf("reconnecting to TCP connection for SSH")
c.conn, err = c.config.Connection() c.conn, err = c.config.Connection()
if err != nil { if err != nil {
log.Printf("reconnection error: %s", err)
return return
} }
log.Printf("handshaking with SSH")
c.client, err = ssh.Client(c.conn, c.config.SSHConfig) c.client, err = ssh.Client(c.conn, c.config.SSHConfig)
if err != nil {
log.Printf("handshake error: %s", err)
}
return return
} }