lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-18 19:49:13 -04:00
Code Issues Releases Wiki Activity

merge log into common log

Browse Source
This commit is contained in:
Darien Raymond
2017-12-19 21:28:12 +01:00
parent 054ceb865d
commit f4c35db968
45 changed files with 297 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
transport/internet/tcp/hub.go
View File

@@ -4,7 +4,6 @@ import (
"context"
gotls "crypto/tls"
"v2ray.com/core/app/log"
"v2ray.com/core/common"
"v2ray.com/core/common/net"
"v2ray.com/core/common/retry"
@@ -28,7 +27,7 @@ func ListenTCP(ctx context.Context, address net.Address, port net.Port, addConn
if err != nil {
return nil, err
}
log.Trace(newError("listening TCP on ", address, ":", port))
newError("listening TCP on ", address, ":", port).WriteToLog()
networkSettings := internet.TransportSettingsFromContext(ctx)
tcpSettings := networkSettings.(*Config)
@@ -74,7 +73,7 @@ func (v *TCPListener) KeepAccepting(ctx context.Context) {
return nil
})
if err != nil {
log.Trace(newError("failed to accepted raw connections").Base(err).AtWarning())
newError("failed to accepted raw connections").Base(err).AtWarning().WriteToLog()
continue
}