fix http send

wlgq2 · Dec 23, 2023 · f80c248 · f80c248
1 parent 86ca4ee
commit f80c248
Show file tree

Hide file tree

Showing 104 changed files with 12 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/doc/README.md b/doc/README.md
diff --git a/doc/cn/Async.md b/doc/cn/Async.md
diff --git a/doc/cn/CycleBuffer.md b/doc/cn/CycleBuffer.md
diff --git a/doc/cn/DnsGet.md b/doc/cn/DnsGet.md
diff --git a/doc/cn/EventLoop.md b/doc/cn/EventLoop.md
diff --git a/doc/cn/GlobalConfig.md b/doc/cn/GlobalConfig.md
diff --git a/doc/cn/Idle.md b/doc/cn/Idle.md
diff --git a/doc/cn/ListBuffer.md b/doc/cn/ListBuffer.md
diff --git a/doc/cn/LogWriter.md b/doc/cn/LogWriter.md
diff --git a/doc/cn/Packet.md b/doc/cn/Packet.md
diff --git a/doc/cn/PacketBuffer.md b/doc/cn/PacketBuffer.md
diff --git a/doc/cn/Signal.md b/doc/cn/Signal.md
diff --git a/doc/cn/SocketAddr.md b/doc/cn/SocketAddr.md
diff --git a/doc/cn/TcpAccepter.md b/doc/cn/TcpAccepter.md
diff --git a/doc/cn/TcpClient.md b/doc/cn/TcpClient.md
diff --git a/doc/cn/TcpConnection.md b/doc/cn/TcpConnection.md
diff --git a/doc/cn/TcpServer.md b/doc/cn/TcpServer.md
diff --git a/doc/cn/Timer.md b/doc/cn/Timer.md
diff --git a/doc/cn/TimerWheel.md b/doc/cn/TimerWheel.md
diff --git a/doc/cn/Udp.md b/doc/cn/Udp.md
diff --git a/doc/cn/http/HttpClient.md b/doc/cn/http/HttpClient.md
diff --git a/doc/cn/http/HttpServer.md b/doc/cn/http/HttpServer.md
diff --git a/doc/cn/http/RadixTree.md b/doc/cn/http/RadixTree.md
diff --git a/doc/cn/http/Request.md b/doc/cn/http/Request.md
diff --git a/doc/cn/http/Response.md b/doc/cn/http/Response.md
diff --git a/doc/en/Async.md b/doc/en/Async.md
diff --git a/doc/en/CycleBuffer.md b/doc/en/CycleBuffer.md
diff --git a/doc/en/DnsGet.md b/doc/en/DnsGet.md
diff --git a/doc/en/EventLoop.md b/doc/en/EventLoop.md
diff --git a/doc/en/GlobalConfig.md b/doc/en/GlobalConfig.md
diff --git a/doc/en/Idle.md b/doc/en/Idle.md
diff --git a/doc/en/ListBuffer.md b/doc/en/ListBuffer.md
diff --git a/doc/en/LogWriter.md b/doc/en/LogWriter.md
diff --git a/doc/en/Packet.md b/doc/en/Packet.md
diff --git a/doc/en/PacketBuffer.md b/doc/en/PacketBuffer.md
diff --git a/doc/en/Signal.md b/doc/en/Signal.md
diff --git a/doc/en/SocketAddr.md b/doc/en/SocketAddr.md
diff --git a/doc/en/TcpAccepter.md b/doc/en/TcpAccepter.md
diff --git a/doc/en/TcpClient.md b/doc/en/TcpClient.md
diff --git a/doc/en/TcpConnection.md b/doc/en/TcpConnection.md
diff --git a/doc/en/TcpServer.md b/doc/en/TcpServer.md
diff --git a/doc/en/Timer.md b/doc/en/Timer.md
diff --git a/doc/en/TimerWheel.md b/doc/en/TimerWheel.md
diff --git a/doc/en/Udp.md b/doc/en/Udp.md
diff --git a/doc/en/http/HttpClient.md b/doc/en/http/HttpClient.md
diff --git a/doc/en/http/HttpServer.md b/doc/en/http/HttpServer.md
diff --git a/doc/en/http/RadixTree.md b/doc/en/http/RadixTree.md
diff --git a/doc/en/http/Request.md b/doc/en/http/Request.md
diff --git a/doc/en/http/Response.md b/doc/en/http/Response.md
diff --git a/examples/all_example/Clinet.hpp b/examples/all_example/Clinet.hpp
diff --git a/examples/all_example/EchoServer.hpp b/examples/all_example/EchoServer.hpp
diff --git a/examples/boost_asio_echo_client/main.cpp b/examples/boost_asio_echo_client/main.cpp
diff --git a/examples/boost_asio_echo_server/main.cpp b/examples/boost_asio_echo_server/main.cpp
diff --git a/examples/clients_cross_thread/Client.cpp b/examples/clients_cross_thread/Client.cpp
diff --git a/examples/clients_cross_thread/Client.hpp b/examples/clients_cross_thread/Client.hpp
diff --git a/examples/clients_cross_thread/main.cpp b/examples/clients_cross_thread/main.cpp
diff --git a/examples/echo_client/main.cpp b/examples/echo_client/main.cpp
diff --git a/examples/loop_exit/main.cpp b/examples/loop_exit/main.cpp
diff --git a/examples/pingpang/Clinet.hpp b/examples/pingpang/Clinet.hpp
diff --git a/examples/pingpang/EchoServer.hpp b/examples/pingpang/EchoServer.hpp
diff --git a/examples/rpc/RpcClient.hpp b/examples/rpc/RpcClient.hpp
diff --git a/examples/rpc/RpcCtrl.hpp b/examples/rpc/RpcCtrl.hpp
diff --git a/examples/rpc/RpcServer.hpp b/examples/rpc/RpcServer.hpp
diff --git a/examples/rpc/protocol.hpp b/examples/rpc/protocol.hpp
diff --git a/examples/server_quit/main.cpp b/examples/server_quit/main.cpp
diff --git a/project/codeblocks_linux/eventloop_quit/eventloop_quit.cbp b/project/codeblocks_linux/eventloop_quit/eventloop_quit.cbp
diff --git a/project/codeblocks_linux/server_quit/server_quit.cbp b/project/codeblocks_linux/server_quit/server_quit.cbp
diff --git a/project/vs2017/loop_exit/loop_exit.vcxproj b/project/vs2017/loop_exit/loop_exit.vcxproj
diff --git a/project/vs2017/loop_exit/loop_exit.vcxproj.filters b/project/vs2017/loop_exit/loop_exit.vcxproj.filters
diff --git a/project/vs2017/loop_exit/loop_exit.vcxproj.user b/project/vs2017/loop_exit/loop_exit.vcxproj.user
diff --git a/project/vs2017/sever_quit/sever_quit.vcxproj b/project/vs2017/sever_quit/sever_quit.vcxproj
diff --git a/project/vs2017/sever_quit/sever_quit.vcxproj.filters b/project/vs2017/sever_quit/sever_quit.vcxproj.filters
diff --git a/project/vs2017/sever_quit/sever_quit.vcxproj.user b/project/vs2017/sever_quit/sever_quit.vcxproj.user
diff --git a/project/vs2017/uv_cpp_lib/uv_cpp_lib.vcxproj b/project/vs2017/uv_cpp_lib/uv_cpp_lib.vcxproj
diff --git a/project/vs2017/uv_cpp_lib/uv_cpp_lib.vcxproj.filters b/project/vs2017/uv_cpp_lib/uv_cpp_lib.vcxproj.filters
diff --git a/project/vs2017/uv_cpp_lib/uv_cpp_lib.vcxproj.user b/project/vs2017/uv_cpp_lib/uv_cpp_lib.vcxproj.user
diff --git a/uv/http/HttpClient.cpp b/uv/http/HttpClient.cpp
@@ -66,7 +66,16 @@ void HttpClient::onConnectStatus(TcpClient::ConnectStatus status)
         isConnected = true;
         std::string str;
         req_.pack(str);
-        client_->write(str.c_str(), (unsigned int)str.size());
+        //std::function<void(const char*,ssize_t)>
+        client_->write(str.c_str(), (unsigned int)str.size(),[this](WriteInfo& info)
+        {
+            if (0 != info.status)
+            {
+                onResp(WriteFail, nullptr);
+                //打印错误信息
+                LogWriter::Instance()->error("Http Write error ：" +std::string(EventLoop::GetErrorMessage(info.status)));
+            }
+        });
     }
     else if (status == uv::TcpClient::ConnectStatus::OnConnectFail)
     {

diff --git a/uv/include/Async.hpp b/uv/include/Async.hpp
diff --git a/uv/include/CycleBuffer.hpp b/uv/include/CycleBuffer.hpp
diff --git a/uv/include/DnsGet.hpp b/uv/include/DnsGet.hpp
diff --git a/uv/include/EventLoop.hpp b/uv/include/EventLoop.hpp
diff --git a/uv/include/GlobalConfig.hpp b/uv/include/GlobalConfig.hpp
diff --git a/uv/include/Idle.hpp b/uv/include/Idle.hpp
diff --git a/uv/include/ListBuffer.hpp b/uv/include/ListBuffer.hpp
diff --git a/uv/include/LogWriter.hpp b/uv/include/LogWriter.hpp
diff --git a/uv/include/Packet.hpp b/uv/include/Packet.hpp
diff --git a/uv/include/PacketBuffer.hpp b/uv/include/PacketBuffer.hpp
diff --git a/uv/include/Signal.hpp b/uv/include/Signal.hpp
diff --git a/uv/include/SocketAddr.hpp b/uv/include/SocketAddr.hpp
diff --git a/uv/include/TcpAcceptor.hpp b/uv/include/TcpAcceptor.hpp
diff --git a/uv/include/TcpClient.hpp b/uv/include/TcpClient.hpp
diff --git a/uv/include/TcpConnection.hpp b/uv/include/TcpConnection.hpp
diff --git a/uv/include/TcpServer.hpp b/uv/include/TcpServer.hpp
diff --git a/uv/include/Timer.hpp b/uv/include/Timer.hpp
diff --git a/uv/include/TimerWheel.hpp b/uv/include/TimerWheel.hpp
diff --git a/uv/include/Udp.hpp b/uv/include/Udp.hpp
diff --git a/uv/include/http/HttpClient.hpp b/uv/include/http/HttpClient.hpp
@@ -20,7 +20,7 @@ namespace uv
 namespace http
 {
 
-class HttpClient 
+class HttpClient
 {
 public:
     enum ReqResult
@@ -29,6 +29,7 @@ class HttpClient
         ConnectFail = 1,
         ParseFail = 2,
         Unknow = 3,
+        WriteFail=4,
     };
     using OnRespCallback = std::function<void(ReqResult, Response*)>;
 public:

diff --git a/uv/include/http/HttpCommon.hpp b/uv/include/http/HttpCommon.hpp
diff --git a/uv/include/http/HttpServer.hpp b/uv/include/http/HttpServer.hpp
diff --git a/uv/include/http/RadixTree.hpp b/uv/include/http/RadixTree.hpp
diff --git a/uv/include/http/Request.hpp b/uv/include/http/Request.hpp
diff --git a/uv/include/http/Response.hpp b/uv/include/http/Response.hpp
diff --git a/uv/include/uv11.hpp b/uv/include/uv11.hpp