epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure instance does not exist before reconnecting

Browse Source
This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-09-08 11:22:23 -03:00
parent eeff2ed652
commit 45137438db
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
handlers/terms.go
View File

@@ -126,6 +126,12 @@ func (m *manager) process() {
t := m.terminals[i.name] t := m.terminals[i.name]
t.write <- i.data t.write <- i.data
case instance := <-m.errorCh: case instance := <-m.errorCh:
// check if it still exists before reconnecting
i := core.InstanceGet(&types.Session{Id: instance.SessionId}, instance.Name)
if i == nil {
log.Println("Instance doest not exist anymore. Won't reconnect")
continue
}
log.Println("reconnecting") log.Println("reconnecting")
m.connect(instance) m.connect(instance)
} }
@@ -177,11 +183,7 @@ func NewManager(s *types.Session) (*manager, error) {
// There is a new instance in a session we are tracking. We should track it's terminal // There is a new instance in a session we are tracking. We should track it's terminal
instanceName := args[0].(string) instanceName := args[0].(string)
instance := core.InstanceGet(s, instanceName) instance := &types.Instance{Name: instanceName}
if instance == nil {
log.Printf("Instance [%s] was not found in session [%s]\n", instanceName, sessionId)
return
}
m.disconnect(instance) m.disconnect(instance)
}) })