From 1c9598b04812c3facb5d7489c5bb12e696e2a5e5 Mon Sep 17 00:00:00 2001 From: Gianluca Arbezzano Date: Thu, 10 Aug 2017 17:42:37 +0200 Subject: [PATCH] Fixed bad messages syntax I was investigating on #34 and I discover some wrong messages. This PR fixed them but it's not fixing the root cause #34. --- provider/swarm.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provider/swarm.go b/provider/swarm.go index 534cdd7..c8b3156 100644 --- a/provider/swarm.go +++ b/provider/swarm.go @@ -66,7 +66,7 @@ func (p SwarmProvider) Scale(serviceId string, target int, direction bool) error logrus.WithFields(logrus.Fields{ "error": err.Error(), "provider": "swarm", - }).Info("Service %s is not scaling.", serviceId) + }).Infof("Service %s is not scaling.", serviceId) return err } @@ -96,7 +96,7 @@ func (p SwarmProvider) Scale(serviceId string, target int, direction bool) error // This function validate if a request is acceptable or not. func (p *SwarmProvider) isAcceptable(tasks []swarm.Task, target int, direction bool) error { - if p.calculateActiveTasks(tasks) < target || p.calculateActiveTasks(tasks) < 2 && direction == false { + if direction == false && (p.calculateActiveTasks(tasks) < target || p.calculateActiveTasks(tasks) < 2) { return errors.New(fmt.Sprintf("I can not scale down because it has only %d running.", target)) } return nil