diff --git a/pwd/instance.go b/pwd/instance.go index 9502ee0..e2b6d91 100644 --- a/pwd/instance.go +++ b/pwd/instance.go @@ -97,8 +97,6 @@ func (p *pwd) InstanceDelete(session *types.Session, instance *types.Instance) e func (p *pwd) InstanceNew(session *types.Session, conf types.InstanceConfig) (*types.Instance, error) { defer observeAction("InstanceNew", time.Now()) - session.Lock() - defer session.Unlock() instances, err := p.storage.InstanceFindBySessionId(session.Id) if err != nil { diff --git a/pwd/types/session.go b/pwd/types/session.go index 1322e77..c93ce7f 100644 --- a/pwd/types/session.go +++ b/pwd/types/session.go @@ -1,28 +1,18 @@ package types import ( - "sync" "time" ) type Session struct { - Id string `json:"id" bson:"id"` - CreatedAt time.Time `json:"created_at" bson:"created_at"` - ExpiresAt time.Time `json:"expires_at" bson:"expires_at"` - PwdIpAddress string `json:"pwd_ip_address" bson:"pwd_ip_address"` - Ready bool `json:"ready" bson:"ready"` - Stack string `json:"stack" bson:"stack"` - StackName string `json:"stack_name" bson:"stack_name"` - ImageName string `json:"image_name" bson:"image_name"` - Host string `json:"host" bson:"host"` - UserId string `json:"user_id" bson:"user_id"` - rw sync.Mutex `json:"-"` -} - -func (s *Session) Lock() { - s.rw.Lock() -} - -func (s *Session) Unlock() { - s.rw.Unlock() + Id string `json:"id" bson:"id"` + CreatedAt time.Time `json:"created_at" bson:"created_at"` + ExpiresAt time.Time `json:"expires_at" bson:"expires_at"` + PwdIpAddress string `json:"pwd_ip_address" bson:"pwd_ip_address"` + Ready bool `json:"ready" bson:"ready"` + Stack string `json:"stack" bson:"stack"` + StackName string `json:"stack_name" bson:"stack_name"` + ImageName string `json:"image_name" bson:"image_name"` + Host string `json:"host" bson:"host"` + UserId string `json:"user_id" bson:"user_id"` }