From 35b5ca4c6326ad415ca1c36ac71a54e266c4e6a5 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Mon, 18 Dec 2017 10:30:08 +0100 Subject: [PATCH] fix isHealthy logic. --- glide.lock | 4 ++-- glide.yaml | 2 +- .../containous/traefik-extra-service-fabric/servicefabric.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glide.lock b/glide.lock index f35752694..edd61a69a 100644 --- a/glide.lock +++ b/glide.lock @@ -1,4 +1,4 @@ -hash: 03cd7f5ecab087e73cc395cb61b58b82cefef55969aa368f93fc17095b92815f +hash: 2ca4d2b4f55342c6a722f70e0ef2e85ac2a38d8395dc206ad3f71a785b9f050f updated: 2017-12-15T10:34:41.246378337+01:00 imports: - name: cloud.google.com/go @@ -94,7 +94,7 @@ imports: - name: github.com/containous/staert version: af517d5b70db9c4b0505e0144fcc62b054057d2a - name: github.com/containous/traefik-extra-service-fabric - version: c01c1ef60ed612c5e42c1ceae0c6f92e67619cc3 + version: ca1fb57108293caad285b1c366b763f6c6ab71c9 - name: github.com/coreos/bbolt version: 3c6cbfb299c11444eb2f8c9d48f0d2ce09157423 - name: github.com/coreos/etcd diff --git a/glide.yaml b/glide.yaml index f582a9187..b394d797d 100644 --- a/glide.yaml +++ b/glide.yaml @@ -12,7 +12,7 @@ import: - package: github.com/cenk/backoff - package: github.com/containous/flaeg - package: github.com/containous/traefik-extra-service-fabric - version: v1.0.4 + version: v1.0.5 - package: github.com/vulcand/oxy version: 7b6e758ab449705195df638765c4ca472248908a repo: https://github.com/containous/oxy.git diff --git a/vendor/github.com/containous/traefik-extra-service-fabric/servicefabric.go b/vendor/github.com/containous/traefik-extra-service-fabric/servicefabric.go index 8183d9480..c23153487 100644 --- a/vendor/github.com/containous/traefik-extra-service-fabric/servicefabric.go +++ b/vendor/github.com/containous/traefik-extra-service-fabric/servicefabric.go @@ -303,7 +303,7 @@ func isPrimary(instance replicaInstance) bool { } func isHealthy(instanceData *sf.ReplicaItemBase) bool { - return instanceData != nil && (instanceData.ReplicaStatus == "Ready" || instanceData.HealthState != "Error") + return instanceData != nil && (instanceData.ReplicaStatus == "Ready" && instanceData.HealthState != "Error") } func hasHTTPEndpoint(instanceData *sf.ReplicaItemBase) bool {