Skip to content

Commit

Permalink
Ensure that we don't add balancees with no health check runs if there…
Browse files Browse the repository at this point in the history
… is a health check defined on it

Change test behavior
  • Loading branch information
jangie committed Feb 3, 2017
1 parent 29059b7 commit ad12a72
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions provider/marathon.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,9 @@ func (provider *Marathon) taskFilter(task marathon.Task, applications *marathon.
return false
}
}
} else {
log.Debugf("Filtering marathon task %s with defined healthcheck as no healthcheck has run yet", task.AppID)
return false
}
}
return true
Expand Down
2 changes: 1 addition & 1 deletion provider/marathon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ func TestMarathonTaskFilter(t *testing.T) {
},
},
},
expected: true,
expected: false,
exposedByDefault: true,
},
{
Expand Down

0 comments on commit ad12a72

Please sign in to comment.