update

src/utils/vhost/router.go

@@ -12,7 +12,6 @@ type VhostRouters struct {
 }
 
 type VhostRouter struct {
-	name     string
 	domain   string
 	location string
 	listener *Listener
@@ -24,6 +23,65 @@ func NewVhostRouters() *VhostRouters {
 	}
 }
 
+func (r *VhostRouters) Add(domain, location string, l *Listener) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+
+	vrs, found := r.RouterByDomain[domain]
+	if !found {
+		vrs = make([]*VhostRouter, 0)
+	}
+
+	vr := &VhostRouter{
+		domain:   domain,
+		location: location,
+		listener: l,
+	}
+	vrs = append(vrs, vr)
+
+	sort.Reverse(ByLocation(vrs))
+	r.RouterByDomain[domain] = vrs
+}
+
+func (r *VhostRouters) Del(l *Listener) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+
+	vrs, found := r.RouterByDomain[l.name]
+	if !found {
+		return
+	}
+
+	for i, vr := range vrs {
+		if vr.listener == l {
+			if len(vrs) > i+1 {
+				r.RouterByDomain[l.name] = append(vrs[:i], vrs[i+1:]...)
+			} else {
+				r.RouterByDomain[l.name] = vrs[:i]
+			}
+		}
+	}
+}
+
+func (r *VhostRouters) Get(host, path string) (vr *VhostRouter, exist bool) {
+	r.mutex.RLock()
+	defer r.mutex.RUnlock()
+
+	vrs, found := r.RouterByDomain[host]
+	if !found {
+		return
+	}
+
+	//can't support load balance,will to do
+	for _, vr = range vrs {
+		if strings.HasPrefix(path, vr.location) {
+			return vr, true
+		}
+	}
+
+	return
+}
+
 //sort by location
 type ByLocation []*VhostRouter
 
@@ -36,72 +94,3 @@ func (a ByLocation) Swap(i, j int) {
 func (a ByLocation) Less(i, j int) bool {
 	return strings.Compare(a[i].location, a[j].location) < 0
 }
-
-func (r *VhostRouters) add(name, domain string, locations []string, l *Listener) {
-	r.mutex.Lock()
-	defer r.mutex.Unlock()
-
-	vrs, found := r.RouterByDomain[domain]
-	if !found {
-		vrs = make([]*VhostRouter, 0)
-	}
-
-	for _, loc := range locations {
-		vr := &VhostRouter{
-			name:     name,
-			domain:   domain,
-			location: loc,
-			listener: l,
-		}
-		vrs = append(vrs, vr)
-	}
-
-	sort.Reverse(ByLocation(vrs))
-	r.RouterByDomain[domain] = vrs
-}
-
-func (r *VhostRouters) del(l *Listener) {
-	r.mutex.Lock()
-	defer r.mutex.Unlock()
-
-	vrs, found := r.RouterByDomain[l.domain]
-	if !found {
-		return
-	}
-
-	for i, vr := range vrs {
-		if vr.listener == l {
-			if len(vrs) > i+1 {
-				r.RouterByDomain[l.domain] = append(vrs[:i], vrs[i+1:]...)
-			} else {
-				r.RouterByDomain[l.domain] = vrs[:i]
-			}
-		}
-	}
-}
-
-func (r *VhostRouters) get(rname string) (vr *VhostRouter, exist bool) {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-
-	var domain, url string
-	tmparray := strings.SplitN(rname, ":", 2)
-	if len(tmparray) == 2 {
-		domain = tmparray[0]
-		url = tmparray[1]
-	}
-
-	vrs, found := r.RouterByDomain[domain]
-	if !found {
-		return
-	}
-
-	//can't support load balance,will to do
-	for _, vr = range vrs {
-		if strings.HasPrefix(url, vr.location) {
-			return vr, true
-		}
-	}
-
-	return
-}