bcicen#191 Remove projects when no any containers left

stokito · Nov 16, 2020 · a3ddfff · a3ddfff
1 parent 07553e9
commit a3ddfff
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/connector/docker.go b/connector/docker.go
@@ -179,6 +179,7 @@ func (cm *Docker) initContainerProject(c *container.Container, labels map[string
 			cm.projects[projectName] = c.Project
 		}
 	}
+	c.Project.Count++
 }
 
 func (cm *Docker) Loop() {
@@ -222,7 +223,15 @@ func (cm *Docker) Get(id string) (*container.Container, bool) {
 // Remove containers by ID
 func (cm *Docker) delByID(id string) {
 	cm.lock.Lock()
-	delete(cm.containers, id)
+	c, hasContainer := cm.containers[id]
+	if hasContainer {
+		c.Project.Count--
+		// if this was the last container in project then remove project
+		if c.Project != cm.noneProject && c.Project.Count <= 0 {
+			delete(cm.projects, c.Project.Name)
+		}
+		delete(cm.containers, id)
+	}
 	cm.lock.Unlock()
 	log.Infof("removed dead container: %s", id)
 }

diff --git a/connector/mock.go b/connector/mock.go
@@ -64,6 +64,7 @@ func (cs *Mock) makeContainer(aggression int64, health bool, project *container.
 	manager := manager.NewMock()
 	c := container.New(makeID(), collector, manager)
 	c.Project = project
+	c.Project.Count++
 	c.SetMeta("name", makeName())
 	c.SetState(makeState())
 	if health {
@@ -117,6 +118,7 @@ func (cs *Mock) All() container.Containers {
 func (cs *Mock) delByID(id string) {
 	for n, c := range cs.containers {
 		if c.Id == id {
+			c.Project.Count--
 			cs.del(n)
 			return
 		}

diff --git a/connector/runc.go b/connector/runc.go
@@ -196,6 +196,7 @@ func (cm *Runc) MustGet(id string) *container.Container {
 		manager := manager.NewRunc()
 		c = container.New(id, collector, manager)
 		c.Project = cm.noneProject
+		c.Project.Count++
 
 		name := libc.ID()
 		// set initial metadata
@@ -218,7 +219,11 @@ func (cm *Runc) MustGet(id string) *container.Container {
 // Remove containers by ID
 func (cm *Runc) delByID(id string) {
 	cm.lock.Lock()
-	delete(cm.containers, id)
+	c, hasContainer := cm.containers[id]
+	if hasContainer {
+		c.Project.Count--
+		delete(cm.containers, id)
+	}
 	delete(cm.libContainers, id)
 	cm.lock.Unlock()
 	log.Infof("removed dead container: %s", id)

diff --git a/container/main.go b/container/main.go
@@ -22,6 +22,7 @@ type Project struct {
 	Name    string
 	WorkDir string
 	Config  string
+	Count   int // Containers Count
 	Widgets *compact.CompactRow
 }