feat: refine log level

shuai132 · Jun 19, 2024 · df54711 · df54711
1 parent fb3ade9
commit df54711
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -104,6 +104,7 @@ jobs:
         run: ./asio_net_test_rpc_reconnect${{ matrix.env.BIN_SUFFIX }}
 
       - name: Test RPC (ssl)
+        if: matrix.os == 'macos-latest'
         working-directory: build
         run: ./asio_net_test_rpc_ssl${{ matrix.env.BIN_SUFFIX }}
 

diff --git a/include/asio_net/detail/rpc_session_t.hpp b/include/asio_net/detail/rpc_session_t.hpp
@@ -50,7 +50,7 @@ class rpc_session_t : noncopyable, public std::enable_shared_from_this<rpc_sessi
       if (tcp_session) {
         tcp_session->send(std::move(data));
       } else {
-        ASIO_NET_LOGW("tcp_session expired on sendPackage");
+        ASIO_NET_LOGW("tcp_session expired");
       }
     };
 

diff --git a/include/asio_net/detail/tcp_channel_t.hpp b/include/asio_net/detail/tcp_channel_t.hpp
@@ -95,9 +95,7 @@ class tcp_channel_t : private noncopyable {
             do_close();
             return;
           } else if (ec || size == 0) {
-            if (ec != asio::error::operation_aborted) {
-              ASIO_NET_LOGE("do_read_header: %s, size: %zu", ec.message().c_str(), size);
-            }
+            ASIO_NET_LOGD("do_read_header: %s, size: %zu", ec.message().c_str(), size);
             do_close();
             return;
           }
@@ -122,9 +120,7 @@ class tcp_channel_t : private noncopyable {
             do_close();
             return;
           } else if (ec || size == 0) {
-            if (ec != asio::error::operation_aborted) {
-              ASIO_NET_LOGE("do_read_body: %s, size: %zu", ec.message().c_str(), size);
-            }
+            ASIO_NET_LOGD("do_read_body: %s, size: %zu", ec.message().c_str(), size);
             do_close();
             return;
           }

diff --git a/include/asio_net/detail/tcp_server_t.hpp b/include/asio_net/detail/tcp_server_t.hpp
@@ -103,8 +103,8 @@ inline void tcp_server_t<socket_type::normal>::do_accept<socket_type::normal>()
       session->start();
       if (on_session) on_session(session);
       tcp_server_t<socket_type::normal>::do_accept<socket_type::normal>();
-    } else if (ec != asio::error::operation_aborted) {
-      ASIO_NET_LOGE("do_accept: %s", ec.message().c_str());
+    } else {
+      ASIO_NET_LOGD("do_accept: %s", ec.message().c_str());
     }
   });
 }
@@ -118,8 +118,8 @@ inline void tcp_server_t<socket_type::domain>::do_accept<socket_type::domain>()
       session->start();
       if (on_session) on_session(session);
       tcp_server_t<socket_type::domain>::do_accept<socket_type::domain>();
-    } else if (ec != asio::error::operation_aborted) {
-      ASIO_NET_LOGE("do_accept: %s", ec.message().c_str());
+    } else {
+      ASIO_NET_LOGD("do_accept: %s", ec.message().c_str());
     }
   });
 }
@@ -140,8 +140,8 @@ inline void tcp_server_t<socket_type::ssl>::do_accept<socket_type::ssl>() {
         }
       });
       do_accept<socket_type::ssl>();
-    } else if (ec != asio::error::operation_aborted) {
-      ASIO_NET_LOGE("do_accept: %s", ec.message().c_str());
+    } else {
+      ASIO_NET_LOGD("do_accept: %s", ec.message().c_str());
     }
   });
 }

diff --git a/include/asio_net/detail/udp_server_t.hpp b/include/asio_net/detail/udp_server_t.hpp
@@ -45,8 +45,8 @@ class udp_server_t : private noncopyable {
       if (!ec && length > 0) {
         if (on_data) on_data((uint8_t*)data_.data(), length, from_endpoint_);
         do_receive();
-      } else if (ec != asio::error::operation_aborted) {
-        ASIO_NET_LOGE("udp_server error: %s", ec.message().c_str());
+      } else {
+        ASIO_NET_LOGD("udp_server error: %s", ec.message().c_str());
       }
     });
   }

diff --git a/include/asio_net/server_discovery.hpp b/include/asio_net/server_discovery.hpp
@@ -73,8 +73,8 @@ class receiver {
           service_found_handle_(std::move(msgs[1]), std::move(msgs[2]));
         }
         do_receive();
-      } else if (ec != asio::error::operation_aborted) {
-        ASIO_NET_LOGE("server_discovery: receive: err: %s", ec.message().c_str());
+      } else {
+        ASIO_NET_LOGD("server_discovery: receive: %s", ec.message().c_str());
       }
     });
   }

diff --git a/test/domain_tcp.cpp b/test/domain_tcp.cpp
@@ -75,6 +75,8 @@ int main(int argc, char** argv) {
     client.open(ENDPOINT);
     client.run();
   }).join();
+
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
   ASSERT(pass_flag_session_close);
   ASSERT(pass_flag_client_close);
   return EXIT_SUCCESS;