vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

restructure and make lint

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-09-19 09:21:14 +02:00
parent aa748b62b2
commit 22d434c1e6
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
13 changed files with 447 additions and 491 deletions
Download patch file Download diff file Expand all files Collapse all files

39
server/server.go
View file

@ -29,7 +29,7 @@ type Server struct {
}
func (s *Server) loadSandboxes() error {
if err := filepath.Walk(s.sandboxDir, func(path string, info os.FileInfo, err error) error {
err := filepath.Walk(s.sandboxDir, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
@ -44,8 +44,8 @@ func (s *Server) loadSandboxes() error {
return err
}
var m metadata
if err := json.Unmarshal(metaJSON, &m); err != nil {
return err
if err2 := json.Unmarshal(metaJSON, &m); err2 != nil {
return err2
}
sname, err := filepath.Rel(s.sandboxDir, path)
if err != nil {
@ -55,7 +55,7 @@ func (s *Server) loadSandboxes() error {
name: sname,
logDir: m.LogDir,
labels: m.Labels,
containers: make(map[string]*oci.Container),
containers: oci.NewMemoryStore(),
})
scontainer, err := oci.NewContainer(m.ContainerName, path, path, m.Labels, sname, false)
if err != nil {
@ -66,10 +66,8 @@ func (s *Server) loadSandboxes() error {
logrus.Warnf("error updating status for container %s: %v", scontainer, err)
}
return nil
}); err != nil {
return err
}
return nil
})
return err
}
// New creates a new Server with options provided
@ -122,31 +120,6 @@ type serverState struct {
containers oci.Store
}
type sandbox struct {
name string
logDir string
labels map[string]string
containers oci.Store
}
type metadata struct {
LogDir string `json:"log_dir"`
ContainerName string `json:"container_name"`
Labels map[string]string `json:"labels"`
}
func (s *sandbox) addContainer(c *oci.Container) {
s.containers.Add(c.Name(), c)
}
func (s *sandbox) getContainer(name string) *oci.Container {
return s.containers.Get(name)
}
func (s *sandbox) removeContainer(c *oci.Container) {
s.containers.Delete(c.Name())
}
func (s *Server) addSandbox(sb *sandbox) {
s.stateLock.Lock()
s.state.sandboxes[sb.name] = sb