refactor: factor out container signaling function

Author: buchdag

internal/generator/generator.go

@@ -132,8 +132,8 @@ func (g *generator) generateFromContainers() {
 			continue
 		}
 		g.runNotifyCmd(config)
-		g.sendSignalToContainer(config)
 		g.sendSignalToContainers(config)
+		g.sendSignalToFilteredContainers(config)
 	}
 }
 
@@ -163,8 +163,8 @@ func (g *generator) generateAtInterval() {
 					// ignore changed return value. always run notify command
 					template.GenerateFile(cfg, containers)
 					g.runNotifyCmd(cfg)
-					g.sendSignalToContainer(cfg)
 					g.sendSignalToContainers(cfg)
+					g.sendSignalToFilteredContainers(cfg)
 				case sig := <-sigChan:
 					log.Printf("Received signal: %s\n", sig)
 					switch sig {
@@ -212,8 +212,8 @@ func (g *generator) generateFromEvents() {
 					continue
 				}
 				g.runNotifyCmd(cfg)
-				g.sendSignalToContainer(cfg)
 				g.sendSignalToContainers(cfg)
+				g.sendSignalToFilteredContainers(cfg)
 			}
 		}(cfg)
 	}
@@ -335,32 +335,36 @@ func (g *generator) runNotifyCmd(config config.Config) {
 	}
 }
 
-func (g *generator) sendSignalToContainer(config config.Config) {
-	if len(config.NotifyContainers) < 1 {
+func (g *generator) sendSignalToContainer(container string, signal int) {
+	log.Printf("Sending container '%s' signal '%v'", container, signal)
+
+	if signal == -1 {
+		if err := g.Client.RestartContainer(container, 10); err != nil {
+			log.Printf("Error sending restarting container: %s", err)
+		}
 		return
 	}
 
-	for container, signal := range config.NotifyContainers {
-		log.Printf("Sending container '%s' signal '%v'", container, signal)
+	killOpts := docker.KillContainerOptions{
+		ID:     container,
+		Signal: docker.Signal(signal),
+	}
+	if err := g.Client.KillContainer(killOpts); err != nil {
+		log.Printf("Error sending signal to container: %s", err)
+	}
+}
 
-		if signal == -1 {
-			if err := g.Client.RestartContainer(container, 10); err != nil {
-				log.Printf("Error sending restarting container: %s", err)
-			}
-			return
-		}
+func (g *generator) sendSignalToContainers(config config.Config) {
+	if len(config.NotifyContainers) < 1 {
+		return
+	}
 
-		killOpts := docker.KillContainerOptions{
-			ID:     container,
-			Signal: docker.Signal(signal),
-		}
-		if err := g.Client.KillContainer(killOpts); err != nil {
-			log.Printf("Error sending signal to container: %s", err)
-		}
+	for container, signal := range config.NotifyContainers {
+		g.sendSignalToContainer(container, signal)
 	}
 }
 
-func (g *generator) sendSignalToContainers(config config.Config) {
+func (g *generator) sendSignalToFilteredContainers(config config.Config) {
 	if len(config.NotifyContainersFilter) < 1 {
 		return
 	}
@@ -372,21 +376,9 @@ func (g *generator) sendSignalToContainers(config config.Config) {
 		log.Printf("Error getting containers: %s", err)
 		return
 	}
+
 	for _, container := range containers {
-		log.Printf("Sending container '%s' signal '%v'", container.ID, config.NotifyContainersSignal)
-		if config.NotifyContainersSignal == -1 {
-			if err := g.Client.RestartContainer(container.ID, 10); err != nil {
-				log.Printf("Error sending restarting container: %s", err)
-			}
-		} else {
-			killOpts := docker.KillContainerOptions{
-				ID:     container.ID,
-				Signal: docker.Signal(config.NotifyContainersSignal),
-			}
-			if err := g.Client.KillContainer(killOpts); err != nil {
-				log.Printf("Error sending signal to container: %s", err)
-			}
-		}
+		g.sendSignalToContainer(container.ID, config.NotifyContainersSignal)
 	}
 }