修改合并最新代码导致的bug
This commit is contained in:
parent
c897e3e58d
commit
183302d27c
@ -176,6 +176,7 @@ func (ctl *Control) Close() error {
|
||||
ctl.exit = true
|
||||
if ctl.conn != nil {
|
||||
ctl.conn.Close()
|
||||
log.Info("conn closed")
|
||||
}
|
||||
ctl.pm.CloseProxies()
|
||||
return nil
|
||||
|
@ -34,6 +34,7 @@ import (
|
||||
"github.com/fatedier/frp/models/config"
|
||||
"github.com/fatedier/frp/utils/log"
|
||||
"github.com/fatedier/frp/utils/version"
|
||||
"github.com/fatedier/golib/crypto"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -109,6 +110,7 @@ func Execute() {
|
||||
|
||||
func RunFrpc(cfgFilePath string) (err error) {
|
||||
cmd = false
|
||||
crypto.DefaultSalt = "frp"
|
||||
return runClient(cfgFilePath)
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user