github
/
frp
mirror of https://github.com/fatedier/frp
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #325 from fatedier/dev 

merge dev to master
pull/347/head^2 v0.10.0
fatedier 2017-05-20 00:39:45 -05:00 committed by GitHub
parent 11260389a1 faf584e1dd
commit 6d81e4c8c6
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
# frp # 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](README.md) | [中文文档](README_zh.md)

2
README_zh.md
View File

@ -1,6 +1,6 @@
# frp # 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](README.md) | [中文文档](README_zh.md)

9
server/metric.go
View File

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

1
server/service.go
View File

@ -111,6 +111,7 @@ func NewService() (svr *Service, err error) {
err = fmt.Errorf("Create dashboard web server error, %v", err) err = fmt.Errorf("Create dashboard web server error, %v", err)
return return
} }
log.Info("Dashboard listen on %s:%d", config.ServerCommonCfg.BindAddr, config.ServerCommonCfg.DashboardPort)
} }
return return
} }