diff --git a/README.md b/README.md index 8b4fe7195718a974ec313e244402b251cfc29814..349ddfd3851dcf20cff43959007f2afbe92069c7 100644 --- 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 index 33c1491a2fc62b7565233e290e83f03adfa11276..0cedd93aa50f3f085fda042f2c2e82c67c97db80 100644 --- 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 index 5c76e64ad5ec0b0550d4508a6b3d5f48bd3e34ac..569330ea59a77eba235d570eb7af4b0b0f854dc6 100644 --- 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 index b9e6cfb2dcb248cf86c3c8fe0666f35385193016..8cd23b6cd5d6645613dba3993e8265af5d236746 100644 --- 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 }