Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-03 22:45:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化日志，避免一些变量的逃逸

Browse Source
This commit is contained in:
boyce
2021-07-01 16:27:48 +08:00
parent 7392d90ef2
commit d9333e31c0
22 changed files with 157 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
network/http_server.go
View File

@@ -42,7 +42,7 @@ func (slf *HttpServer) startListen() error {
for _, caFile := range slf.caFileList {
cer, err := tls.LoadX509KeyPair(caFile.CertFile, caFile.Keyfile)
if err != nil {
log.Fatal("Load CA [%s]-[%s] file is fail:%s", caFile.CertFile, caFile.Keyfile, err.Error())
log.SFatal("Load CA [",caFile.CertFile,"]-[",caFile.Keyfile,"] file is fail:",err.Error())
return err
}
tlsCaList = append(tlsCaList, cer)
@@ -69,7 +69,7 @@ func (slf *HttpServer) startListen() error {
}
if err != nil {
log.Fatal("Listen for address %s failure:%+v.",slf.listenAddr,err)
log.SFatal("Listen for address ",slf.listenAddr," failure:",err.Error())
return err
}

12
network/tcp_client.go
View File

@@ -42,21 +42,21 @@ func (client *TCPClient) init() {
if client.ConnNum <= 0 {
client.ConnNum = 1
log.Release("invalid ConnNum, reset to %v", client.ConnNum)
log.SRelease("invalid ConnNum, reset to ", client.ConnNum)
}
if client.ConnectInterval <= 0 {
client.ConnectInterval = 3 * time.Second
log.Release("invalid ConnectInterval, reset to %v", client.ConnectInterval)
log.SRelease("invalid ConnectInterval, reset to ", client.ConnectInterval)
}
if client.PendingWriteNum <= 0 {
client.PendingWriteNum = 1000
log.Release("invalid PendingWriteNum, reset to %v", client.PendingWriteNum)
log.SRelease("invalid PendingWriteNum, reset to ", client.PendingWriteNum)
}
if client.NewAgent == nil {
log.Fatal("NewAgent must not be nil")
log.SFatal("NewAgent must not be nil")
}
if client.cons != nil {
log.Fatal("client is running")
log.SFatal("client is running")
}
client.cons = make(ConnSet)
@@ -79,7 +79,7 @@ func (client *TCPClient) dial() net.Conn {
return conn
}
log.Warning("connect to %v error: %v", client.Addr, err)
log.SWarning("connect to ",client.Addr," error:", err.Error())
time.Sleep(client.ConnectInterval)
continue
}

2
network/tcp_conn.go
View File

@@ -89,7 +89,7 @@ func (tcpConn *TCPConn) GetRemoteIp() string {
func (tcpConn *TCPConn) doWrite(b []byte) {
if len(tcpConn.writeChan) == cap(tcpConn.writeChan) {
tcpConn.ReleaseReadMsg(b)
log.Error("close conn: channel full")
log.SError("close conn: channel full")
tcpConn.doDestroy()
return
}

12
network/tcp_server.go
View File

@@ -35,19 +35,19 @@ func (server *TCPServer) Start() {
func (server *TCPServer) init() {
ln, err := net.Listen("tcp", server.Addr)
if err != nil {
log.Fatal("%v", err)
log.SFatal("Listen tcp error:", err.Error())
}
if server.MaxConnNum <= 0 {
server.MaxConnNum = 100
log.Release("invalid MaxConnNum, reset to %v", server.MaxConnNum)
log.SRelease("invalid MaxConnNum, reset to ", server.MaxConnNum)
}
if server.PendingWriteNum <= 0 {
server.PendingWriteNum = 100
log.Release("invalid PendingWriteNum, reset to %v", server.PendingWriteNum)
log.SRelease("invalid PendingWriteNum, reset to ", server.PendingWriteNum)
}
if server.NewAgent == nil {
log.Fatal("NewAgent must not be nil")
log.SFatal("NewAgent must not be nil")
}
server.ln = ln
@@ -89,7 +89,7 @@ func (server *TCPServer) run() {
if max := 1 * time.Second; tempDelay > max {
tempDelay = max
}
log.Release("accept error: %v; retrying in %v", err, tempDelay)
log.SRelease("accept error:",err.Error(),"; retrying in ", tempDelay)
time.Sleep(tempDelay)
continue
}
@@ -102,7 +102,7 @@ func (server *TCPServer) run() {
if len(server.conns) >= server.MaxConnNum {
server.mutexConns.Unlock()
conn.Close()
log.Debug("too many connections")
log.SWarning("too many connections")
continue
}
server.conns[conn] = struct{}{}

16
network/ws_client.go
View File

@@ -38,29 +38,29 @@ func (client *WSClient) init() {
if client.ConnNum <= 0 {
client.ConnNum = 1
log.Release("invalid ConnNum, reset to %v", client.ConnNum)
log.SRelease("invalid ConnNum, reset to ", client.ConnNum)
}
if client.ConnectInterval <= 0 {
client.ConnectInterval = 3 * time.Second
log.Release("invalid ConnectInterval, reset to %v", client.ConnectInterval)
log.SRelease("invalid ConnectInterval, reset to ", client.ConnectInterval)
}
if client.PendingWriteNum <= 0 {
client.PendingWriteNum = 100
log.Release("invalid PendingWriteNum, reset to %v", client.PendingWriteNum)
log.SRelease("invalid PendingWriteNum, reset to ", client.PendingWriteNum)
}
if client.MaxMsgLen <= 0 {
client.MaxMsgLen = 4096
log.Release("invalid MaxMsgLen, reset to %v", client.MaxMsgLen)
log.SRelease("invalid MaxMsgLen, reset to ", client.MaxMsgLen)
}
if client.HandshakeTimeout <= 0 {
client.HandshakeTimeout = 10 * time.Second
log.Release("invalid HandshakeTimeout, reset to %v", client.HandshakeTimeout)
log.SRelease("invalid HandshakeTimeout, reset to ", client.HandshakeTimeout)
}
if client.NewAgent == nil {
log.Fatal("NewAgent must not be nil")
log.SFatal("NewAgent must not be nil")
}
if client.cons != nil {
log.Fatal("client is running")
log.SFatal("client is running")
}
client.cons = make(WebsocketConnSet)
@@ -77,7 +77,7 @@ func (client *WSClient) dial() *websocket.Conn {
return conn
}
log.Release("connect to %v error: %v", client.Addr, err)
log.SRelease("connect to ", client.Addr," error: ", err.Error())
time.Sleep(client.ConnectInterval)
continue
}

2
network/ws_conn.go
View File

@@ -75,7 +75,7 @@ func (wsConn *WSConn) Close() {
func (wsConn *WSConn) doWrite(b []byte) {
if len(wsConn.writeChan) == cap(wsConn.writeChan) {
log.Debug("close conn: channel full")
log.SDebug("close conn: channel full")
wsConn.doDestroy()
return
}

18
network/ws_server.go
View File

@@ -41,7 +41,7 @@ func (handler *WSHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
conn, err := handler.upgrader.Upgrade(w, r, nil)
if err != nil {
log.Debug("upgrade error: %v", err)
log.SError("upgrade error: ", err.Error())
return
}
conn.SetReadLimit(int64(handler.maxMsgLen))
@@ -58,7 +58,7 @@ func (handler *WSHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if len(handler.conns) >= handler.maxConnNum {
handler.mutexConns.Unlock()
conn.Close()
log.Debug("too many connections")
log.SWarning("too many connections")
return
}
handler.conns[conn] = struct{}{}
@@ -79,27 +79,27 @@ func (handler *WSHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
func (server *WSServer) Start() {
ln, err := net.Listen("tcp", server.Addr)
if err != nil {
log.Fatal("%v", err)
log.SFatal("WSServer Listen fail:", err.Error())
}
if server.MaxConnNum <= 0 {
server.MaxConnNum = 100
log.Release("invalid MaxConnNum, reset to %v", server.MaxConnNum)
log.SRelease("invalid MaxConnNum, reset to ", server.MaxConnNum)
}
if server.PendingWriteNum <= 0 {
server.PendingWriteNum = 100
log.Release("invalid PendingWriteNum, reset to %v", server.PendingWriteNum)
log.SRelease("invalid PendingWriteNum, reset to ", server.PendingWriteNum)
}
if server.MaxMsgLen <= 0 {
server.MaxMsgLen = 4096
log.Release("invalid MaxMsgLen, reset to %v", server.MaxMsgLen)
log.SRelease("invalid MaxMsgLen, reset to ", server.MaxMsgLen)
}
if server.HTTPTimeout <= 0 {
server.HTTPTimeout = 10 * time.Second
log.Release("invalid HTTPTimeout, reset to %v", server.HTTPTimeout)
log.SRelease("invalid HTTPTimeout, reset to ", server.HTTPTimeout)
}
if server.NewAgent == nil {
log.Fatal("NewAgent must not be nil")
log.SFatal("NewAgent must not be nil")
}
if server.CertFile != "" || server.KeyFile != "" {
@@ -110,7 +110,7 @@ func (server *WSServer) Start() {
config.Certificates = make([]tls.Certificate, 1)
config.Certificates[0], err = tls.LoadX509KeyPair(server.CertFile, server.KeyFile)
if err != nil {
log.Fatal("%v", err)
log.SFatal("LoadX509KeyPair fail:", err.Error())
}
ln = tls.NewListener(ln, config)