Push last changes

roberth1988 · Sep 29, 2020 · e71caa5 · e71caa5
1 parent 5f46e78
commit e71caa5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/cleaner/cleaner.go b/cleaner/cleaner.go
@@ -78,7 +78,7 @@ func (c *HangingDropletsCleaner) Collect(ch chan<- prometheus.Metric) {
 
 func (c *HangingDropletsCleaner) shouldRemoveDroplet(droplet godo.Droplet, machines []Machine) bool {
 	for _, machine := range machines {
-		if droplet.Name == machine.Name && machine.DropletId != "" {
+		if droplet.Name == machine.Name && machine.DropletId != 0 {
 			return false
 		}
 	}

diff --git a/cleaner/cleaner_test.go b/cleaner/cleaner_test.go
@@ -131,7 +131,7 @@ func TestCleanerNoDroplets(t *testing.T) {
 		machines = []Machine{
 			{
 				Name:      "runner-abc123-test-1",
-				DropletId: "",
+				DropletId: 0,
 			},
 		}
 		return
@@ -171,7 +171,7 @@ func TestCleanerDropletsAndMachinesNotMatching(t *testing.T) {
 		machines = []Machine{
 			{
 				Name:      "runner-abc123-test-1",
-				DropletId: "0",
+				DropletId: 0,
 			},
 		}
 		return
@@ -214,7 +214,7 @@ func TestCleanerDropletsAndMachinesPartiallyMatching(t *testing.T) {
 		machines = []Machine{
 			{
 				Name:      "runner-abc123-test-1",
-				DropletId: "0",
+				DropletId: 0,
 			},
 		}
 		return
@@ -257,11 +257,11 @@ func TestCleanerDropletsAndMachinesMatching(t *testing.T) {
 		machines = []Machine{
 			{
 				Name:      "runner-abc123-test-1",
-				DropletId: "0",
+				DropletId: 0,
 			},
 			{
 				Name:      "runner-abc123-test-2",
-				DropletId: "0",
+				DropletId: 0,
 			},
 		}
 		return

diff --git a/cleaner/machines_finder.go b/cleaner/machines_finder.go
@@ -18,7 +18,7 @@ type MachinesFinder struct {
 
 type Machine struct {
 	Name      string
-	DropletId string
+	DropletId float64
 }
 
 func (m *MachinesFinder) ListMachines(runnerPrefixRegexp *regexp.Regexp) ([]Machine, error) {
@@ -35,8 +35,8 @@ func (m *MachinesFinder) ListMachines(runnerPrefixRegexp *regexp.Regexp) ([]Mach
 			continue
 		}
 
-		configFile := fmt.Sprintf("%s/config.json", name)
-		dropletId := ""
+		configFile := fmt.Sprintf("%s/%s/config.json", m.machinesDirectory, name)
+		dropletId := float64(0)
 
 		if _, err := os.Stat(configFile); os.IsNotExist(err) {
 			return nil, err
@@ -58,9 +58,9 @@ func (m *MachinesFinder) ListMachines(runnerPrefixRegexp *regexp.Regexp) ([]Mach
 
 			if driverConfig, ok := dockerMachineConfigParsed["Driver"].(map[string]interface{}); ok {
 
-				dropletIdString := driverConfig["DropletID"].(string)
+				dropletIdString := driverConfig["DropletID"].(float64)
 
-				if dropletIdString != "0" {
+				if dropletIdString != 0 {
 					dropletId = dropletIdString
 				}
 			}