fix(network):1.10.12, 解决TcpConnection在发生error时，没有当作连接断开处理的问题

Author: hevake

modules/network/tcp_acceptor.cpp

@@ -27,6 +27,7 @@
 #include <tbox/base/log.h>
 #include <tbox/base/assert.h>
 #include <tbox/base/wrapped_recorder.h>
+#include <tbox/util/fs.h>
 
 #include "tcp_connection.h"
 
@@ -134,9 +135,7 @@ void TcpAcceptor::cleanup()
     //! 对于Unix Domain的Socket在退出的时候要删除对应的socket文件
     if (bind_addr_.type() == SockAddr::Type::kLocal) {
         auto socket_file = bind_addr_.toString();
-        int ret = ::unlink(socket_file.c_str());
-        if (ret != 0)
-            LogWarn("remove file %s fail. errno:%d, %s", socket_file.c_str(), errno, strerror(errno));
+        util::fs::RemoveFile(socket_file);
     }
 }
 
@@ -153,7 +152,7 @@ void TcpAcceptor::onClientConnected()
     socklen_t addr_len = sizeof(addr);
     SocketFd peer_sock = sock_fd_.accept(&addr, &addr_len);
     if (peer_sock.isNull()) {
-        LogWarn("accept fail");
+        LogNotice("accept fail");
         return;
     }
 

modules/network/tcp_connection.cpp

@@ -150,11 +150,8 @@ void TcpConnection::onSocketClosed()
 
 void TcpConnection::onError(int errnum)
 {
-    if (errnum == ECONNRESET) {
-        onSocketClosed();
-    } else {
-        LogWarn("errno:%d, %s", errnum, strerror(errnum));
-    }
+    LogNotice("errno:%d, %s", errnum, strerror(errnum));
+    onSocketClosed();
 }
 
 }

modules/network/tcp_connector.cpp

@@ -185,7 +185,7 @@ void TcpConnector::enterConnectingState()
         || (conn_errno == EADDRINUSE) || (conn_errno == EADDRNOTAVAIL)
         || (conn_errno == ECONNREFUSED) || (conn_errno == ENETUNREACH)
         || (conn_errno == ENOENT)) {
-        LogWarn("connent fail, errno:%d, %s", conn_errno, strerror(conn_errno));
+        LogNotice("connent fail, errno:%d, %s", conn_errno, strerror(conn_errno));
         //! 条件暂时不具备
         onConnectFail();
 
@@ -261,7 +261,7 @@ void TcpConnector::onConnectFail()
             connect_fail_cb_();
             --cb_level_;
         } else
-            LogWarn("connector stoped");
+            LogNotice("connector stoped");
 
         state_ = State::kInited;
     } else

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 10
-TBOX_VERSION_REVISION := 11
+TBOX_VERSION_REVISION := 12