From d93dd82ed907f5277ace8a4fc4fa324498b26f6f Mon Sep 17 00:00:00 2001
From: XueBing <xuebing1110@gmail.com>
Date: Sun, 18 Dec 2016 23:35:14 +0800
Subject: [PATCH] modify the getListener function && add TPS in dashboard

---
 src/assets/static/index.html |  4 +++-
 src/utils/vhost/vhost.go     | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/assets/static/index.html b/src/assets/static/index.html
index dc7f3626..d9170081 100644
--- a/src/assets/static/index.html
+++ b/src/assets/static/index.html
@@ -25,6 +25,7 @@
                   <th class="tab_info" ng-click="col='current_conns';desc=!desc">CurCon<i class="iconfont pull-right">&#xe66d;</i></th>
                   <th class="tab_info" ng-click="col='daily[daily.length-1].flow_out';desc=!desc">FlowOut<i class="iconfont pull-right">&#xe66d;</i></th>
                   <th class="tab_info" ng-click="col='daily[daily.length-1].flow_in';desc=!desc">FlowIn<i class="iconfont pull-right">&#xe66d;</i></th>
+                  <th class="tab_info" ng-click="col='daily[daily.length-1].total_accept_conns';desc=!desc">TotalAcceptConns<i class="iconfont pull-right">&#xe66d;</i></th>
                 </tr>
               </thead>
               <tbody id="tab_body">
@@ -34,10 +35,11 @@
                   </td>
                   <td><span ng-bind="x.type"></span></td>
                   <td><span ng-bind="x.listen_port"></span></td>
-                  <td><span ng-bind="x.status"></span></td>
+                  <td><span ng-bind="x.status_desc"></span></td>
                   <td><span ng-bind="x.current_conns"></span></td>
                   <td><span ng-bind="x.daily[x.daily.length-1].flow_out"></span></td>
                   <td><span ng-bind="x.daily[x.daily.length-1].flow_in"></span></td>
+                  <td><span ng-bind="x.daily[x.daily.length-1].total_accept_conns"></span></td>
                 </tr>
               </tbody>
             </table>
diff --git a/src/utils/vhost/vhost.go b/src/utils/vhost/vhost.go
index fb0b5c8f..a7e953f0 100644
--- a/src/utils/vhost/vhost.go
+++ b/src/utils/vhost/vhost.go
@@ -76,10 +76,19 @@ func (v *VhostMuxer) Listen(p *config.ProxyServerConf) (ls []*Listener) {
 	return ls
 }
 
-func (v *VhostMuxer) getListener(name string) (l *Listener, exist bool) {
+func (v *VhostMuxer) getListener(reqInfoMap map[string]string) (l *Listener, exist bool) {
 	v.mutex.RLock()
 	defer v.mutex.RUnlock()
 
+	//host
+	name := strings.ToLower(reqInfoMap["Host"])
+
+	// http
+	scheme := strings.ToLower(reqInfoMap["Scheme"])
+	if scheme == "http" || scheme == "" {
+		name = name + ":" + reqInfoMap["Path"]
+	}
+
 	// // first we check the full hostname
 	vr, found := v.registryRouter.get(name)
 	if found {
@@ -126,12 +135,7 @@ func (v *VhostMuxer) handle(c *conn.Conn) {
 		return
 	}
 
-	name := strings.ToLower(reqInfoMap["Host"])
-	// get listener by hostname
-	if reqInfoMap["Scheme"] == "http" {
-		name = name + ":" + reqInfoMap["Path"]
-	}
-	l, ok := v.getListener(name)
+	l, ok := v.getListener(reqInfoMap)
 	if !ok {
 		c.Close()
 		return