Merge pull request #325 from fatedier/dev

merge dev to master

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)
 

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)
 

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(),

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
 }