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

Fix close session bug

Browse Source
This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-08-10 16:47:48 -03:00
parent 7c89054f16
commit 79181b2a17
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pwd/instance.go
View File

@@ -84,12 +84,12 @@ func (p *pwd) InstanceDelete(session *types.Session, instance *types.Instance) e
return err return err
} }
p.event.Emit(event.INSTANCE_DELETE, session.Id, instance.Name)
if err := p.storage.InstanceDelete(session.Id, instance.Name); err != nil { if err := p.storage.InstanceDelete(session.Id, instance.Name); err != nil {
return err return err
} }
p.event.Emit(event.INSTANCE_DELETE, session.Id, instance.Name)
p.setGauges() p.setGauges()
return nil return nil

22
pwd/session.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/play-with-docker/play-with-docker/docker" "github.com/play-with-docker/play-with-docker/docker"
"github.com/play-with-docker/play-with-docker/event" "github.com/play-with-docker/play-with-docker/event"
"github.com/play-with-docker/play-with-docker/pwd/types" "github.com/play-with-docker/play-with-docker/pwd/types"
"github.com/play-with-docker/play-with-docker/storage"
) )
var preparedSessions = map[string]bool{} var preparedSessions = map[string]bool{}
@@ -72,7 +73,7 @@ func (p *pwd) SessionNew(duration time.Duration, stack, stackName, imageName str
} }
if err := dockerClient.CreateNetwork(s.Id); err != nil { if err := dockerClient.CreateNetwork(s.Id); err != nil {
log.Println("ERROR NETWORKING") log.Println("ERROR NETWORKING", err)
return nil, err return nil, err
} }
log.Printf("Network [%s] created for session [%s]\n", s.Id, s.Id) log.Printf("Network [%s] created for session [%s]\n", s.Id, s.Id)
@@ -99,8 +100,17 @@ func (p *pwd) SessionNew(duration time.Duration, stack, stackName, imageName str
func (p *pwd) SessionClose(s *types.Session) error { func (p *pwd) SessionClose(s *types.Session) error {
defer observeAction("SessionClose", time.Now()) defer observeAction("SessionClose", time.Now())
s.Lock() updatedSession, err := p.storage.SessionGet(s.Id)
defer s.Unlock() if err != nil {
if storage.NotFound(err) {
log.Printf("Session with id [%s] was not found in storage.\n", s.Id)
return err
} else {
log.Printf("Couldn't close session. Got: %s\n", err)
return err
}
}
s = updatedSession
log.Printf("Starting clean up of session [%s]\n", s.Id) log.Printf("Starting clean up of session [%s]\n", s.Id)
for _, i := range s.Instances { for _, i := range s.Instances {
@@ -113,11 +123,11 @@ func (p *pwd) SessionClose(s *types.Session) error {
// Disconnect PWD daemon from the network // Disconnect PWD daemon from the network
if err := p.docker(s.Id).DisconnectNetwork(config.L2ContainerName, s.Id); err != nil { if err := p.docker(s.Id).DisconnectNetwork(config.L2ContainerName, s.Id); err != nil {
if !strings.Contains(err.Error(), "is not connected to the network") { if !strings.Contains(err.Error(), "is not connected to the network") {
log.Println("ERROR NETWORKING") log.Println("ERROR NETWORKING", err)
return err return err
} }
} }
log.Printf("Disconnected pwd from network [%s]\n", s.Id) log.Printf("Disconnected l2 from network [%s]\n", s.Id)
if err := p.docker(s.Id).DeleteNetwork(s.Id); err != nil { if err := p.docker(s.Id).DeleteNetwork(s.Id); err != nil {
if !strings.Contains(err.Error(), "not found") { if !strings.Contains(err.Error(), "not found") {
log.Println(err) log.Println(err)
@@ -125,7 +135,7 @@ func (p *pwd) SessionClose(s *types.Session) error {
} }
} }
err := p.storage.SessionDelete(s.Id) err = p.storage.SessionDelete(s.Id)
if err != nil { if err != nil {
return err return err
} }