From 790b1ea45db96f510fbd97dbe10a10d5ce8dc7cc Mon Sep 17 00:00:00 2001 From: Chanwit Kaewkasi Date: Sun, 11 Jan 2015 15:34:07 +0700 Subject: [PATCH] cleanup and add comments Signed-off-by: Chanwit Kaewkasi --- scheduler/filter/constraint.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scheduler/filter/constraint.go b/scheduler/filter/constraint.go index b06645ac8b..ef264b2ff6 100644 --- a/scheduler/filter/constraint.go +++ b/scheduler/filter/constraint.go @@ -41,21 +41,21 @@ func (f *ConstraintFilter) match(pattern, s string, useRegex bool) bool { func (f *ConstraintFilter) Filter(config *dockerclient.ContainerConfig, nodes []*cluster.Node) ([]*cluster.Node, error) { constraints := extractEnv("constraint", config.Env) for k, v := range constraints { - - v0 := v - log.Debugf("matching constraint: %s=%s", k, v) - negate := false - useRegex := false + // keep the original for display in case of error + v0 := v + negate := false if strings.HasPrefix(v, "!") { log.Debugf("negate detected") v = strings.TrimPrefix(v, "!") negate = true } + + useRegex := false if strings.HasPrefix(v, "/") && strings.HasSuffix(v, "/") { - log.Infof("regex detected") + log.Debugf("regex detected") v = strings.TrimPrefix(strings.TrimSuffix(v, "/"), "/") useRegex = true }