chenyh
/
vRp.CD2g_test
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 修改 ShowServersInfo 函数可见性，修复服务器地址打印的指针问题

This commit is contained in:
kercylan98 2023-12-26 17:23:28 +08:00
parent b39625c0cb
commit 26aa2d9ff8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/multiple.go
View File

@ -69,7 +69,7 @@ func (slf *MultipleServer) Run() {
kcp.SystemTimedSched.Close() kcp.SystemTimedSched.Close()
} }
ShowServersInfo(serverMultipleMark, slf.servers...) showServersInfo(serverMultipleMark, slf.servers...)
systemSignal := make(chan os.Signal, 1) systemSignal := make(chan os.Signal, 1)
signal.Notify(systemSignal, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT) signal.Notify(systemSignal, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)

7
server/server.go
View File

@ -129,7 +129,7 @@ func (srv *Server) Run(addr string) (err error) {
onServicesInit(srv) onServicesInit(srv)
onMessageSystemInit(srv) onMessageSystemInit(srv)
if srv.multiple == nil { if srv.multiple == nil {
ShowServersInfo(serverMark, srv) showServersInfo(serverMark, srv)
} }
if err = <-startState; err != nil { if err = <-startState; err != nil {
return err return err
@ -780,11 +780,12 @@ func (srv *Server) HasMessageStatistics() bool {
return srv.runtime.messageStatisticsLock != nil return srv.runtime.messageStatisticsLock != nil
} }
// ShowServersInfo 显示服务器信息 // showServersInfo 显示服务器信息
func ShowServersInfo(mark string, servers ...*Server) { func showServersInfo(mark string, servers ...*Server) {
var serverInfos = make([]func(), 0, len(servers)) var serverInfos = make([]func(), 0, len(servers))
var ip, _ = network.IP() var ip, _ = network.IP()
for _, srv := range servers { for _, srv := range servers {
srv := srv
serverInfos = append(serverInfos, func() { serverInfos = append(serverInfos, func() {
log.Info("Server", log.String(mark, "RunningInfo"), log.Any("network", srv.network), log.String("ip", ip.String()), log.String("listen", srv.addr)) log.Info("Server", log.String(mark, "RunningInfo"), log.Any("network", srv.network), log.String("ip", ip.String()), log.String("listen", srv.addr))
}) })