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

Update event names

Browse Source
This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-07-24 14:55:17 -03:00
parent fd7441943d
commit 8424479e76
6 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pwd/session.go
View File

@@ -14,7 +14,7 @@ import (
"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/pwd/types"
"github.com/twinj/uuid"
"github.com/rs/xid"
)
var preparedSessions = map[string]bool{}
@@ -44,7 +44,7 @@ func (p *pwd) SessionNew(duration time.Duration, stack, stackName, imageName str
defer observeAction("SessionNew", time.Now())
s := &types.Session{}
s.Id = uuid.NewV4().String()
s.Id = xid.New().String()
s.Instances = map[string]*types.Instance{}
s.CreatedAt = time.Now()
s.ExpiresAt = s.CreatedAt.Add(duration)
@@ -186,7 +186,12 @@ func (p *pwd) SessionDeployStack(s *types.Session) error {
func (p *pwd) SessionGet(sessionId string) *types.Session {
defer observeAction("SessionGet", time.Now())
s, _ := p.storage.SessionGet(sessionId)
s, err := p.storage.SessionGet(sessionId)
if err != nil {
log.Println(err)
return nil
}
if _, err := p.prepareSession(s); err != nil {
log.Println(err)