Merge pull request fatedier#325 from fatedier/dev

merge dev to master
guyueyuqi · May 20, 2017 · 6d81e4c · 6d81e4c
2 parents 1126038 + faf584e
commit 6d81e4c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # frp
 
-[![Build Status](https://travis-ci.org/fatedier/frp.svg)](https://travis-ci.org/fatedier/frp)
+[![Build Status](https://travis-ci.org/fatedier/frp.svg?branch=master)](https://travis-ci.org/fatedier/frp)
 
 [README](README.md) | [中文文档](README_zh.md)
 

diff --git a/README_zh.md b/README_zh.md
@@ -1,6 +1,6 @@
 # frp
 
-[![Build Status](https://travis-ci.org/fatedier/frp.svg)](https://travis-ci.org/fatedier/frp)
+[![Build Status](https://travis-ci.org/fatedier/frp.svg?branch=master)](https://travis-ci.org/fatedier/frp)
 
 [README](README.md) | [中文文档](README_zh.md)
 

diff --git a/server/metric.go b/server/metric.go
@@ -32,9 +32,14 @@ type ServerStatistics struct {
 	TotalTrafficOut metric.DateCounter
 	CurConns        metric.Counter
 
-	ClientCounts    metric.Counter
+	// counter for clients
+	ClientCounts metric.Counter
+
+	// counter for proxy types
 	ProxyTypeCounts map[string]metric.Counter
 
+	// statistics for different proxies
+	// key is proxy name
 	ProxyStatistics map[string]*ProxyStatistics
 
 	mu sync.Mutex
@@ -84,7 +89,7 @@ func StatsNewProxy(name string, proxyType string) {
 		globalStats.ProxyTypeCounts[proxyType] = counter
 
 		proxyStats, ok := globalStats.ProxyStatistics[name]
-		if !ok {
+		if !(ok && proxyStats.ProxyType == proxyType) {
 			proxyStats = &ProxyStatistics{
 				ProxyType:  proxyType,
 				CurConns:   metric.NewCounter(),

diff --git a/server/service.go b/server/service.go
@@ -111,6 +111,7 @@ func NewService() (svr *Service, err error) {
 			err = fmt.Errorf("Create dashboard web server error, %v", err)
 			return
 		}
+		log.Info("Dashboard listen on %s:%d", config.ServerCommonCfg.BindAddr, config.ServerCommonCfg.DashboardPort)
 	}
 	return
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,6 +111,7 @@ func NewService() (svr *Service, err error) { @@
     			err = fmt.Errorf("Create dashboard web server error, %v", err)
     			return
     		}
+    		log.Info("Dashboard listen on %s:%d", config.ServerCommonCfg.BindAddr, config.ServerCommonCfg.DashboardPort)
     	}
     	return
     }
@@ Expand Down @@