XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2026-01-11 22:23:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

CR: export error string generation to a function

Browse Source
This commit is contained in:
Guy Lewin
2020-02-11 16:57:38 +02:00
parent 9440bc5d72
commit 98fa3855bd
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/control.go
View File

@@ -31,6 +31,7 @@ import (
"github.com/fatedier/frp/server/controller"
"github.com/fatedier/frp/server/proxy"
"github.com/fatedier/frp/server/stats"
"github.com/fatedier/frp/utils/util"
"github.com/fatedier/frp/utils/version"
"github.com/fatedier/frp/utils/xlog"
@@ -438,12 +439,8 @@ func (ctl *Control) manager() {
ProxyName: m.ProxyName,
}
if err != nil {
if ctl.serverCfg.DetailedErrorsToClient {
resp.Error = err.Error()
} else {
resp.Error = fmt.Sprintf("new proxy [%s] error", m.ProxyName)
}
xl.Warn("new proxy [%s] error: %v", m.ProxyName, err)
resp.Error = util.GenerateResponseErrorString(fmt.Sprintf("new proxy [%s] error", m.ProxyName), err, ctl.serverCfg.DetailedErrorsToClient)
} else {
resp.RemoteAddr = remoteAddr
xl.Info("new proxy [%s] success", m.ProxyName)