Explorar el Código

Apply domain selector choice

Shelikhoo hace 4 años
padre
commit
9d653dc708
Se han modificado 1 ficheros con 14 adiciones y 4 borrados
  1. 14 4
      app/router/config.go

+ 14 - 4
app/router/config.go

@@ -69,11 +69,21 @@ func (rr *RoutingRule) BuildCondition() (Condition, error) {
 	conds := NewConditionChan()
 
 	if len(rr.Domain) > 0 {
-		matcher, err := NewACAutomatonDomainMatcher(rr.Domain)
-		if err != nil {
-			return nil, newError("failed to build domain condition").Base(err)
+		switch rr.DomainMatcher {
+		case "ac":
+			matcher, err := NewACAutomatonDomainMatcher(rr.Domain)
+			if err != nil {
+				return nil, newError("failed to build domain condition").Base(err)
+			}
+			conds.Add(matcher)
+		default:
+			matcher, err := NewDomainMatcher(rr.Domain)
+			if err != nil {
+				return nil, newError("failed to build domain condition").Base(err)
+			}
+			conds.Add(matcher)
 		}
-		conds.Add(matcher)
+
 	}
 
 	if len(rr.UserEmail) > 0 {