feat: add socket mode options and enhance logging with file descriptors

Author: chenxuan520

docs/cppnet/ssl/ssl_context.md

@@ -39,9 +39,10 @@
 - 参数：无
 - 返回值：指向 `SSLSocket` 的智能指针。
 - 作用：创建一个新的 SSL 套接字。
-## std::shared_ptr\<SSLSocket\> AcceptSSL(const Socket &soc)
+## std::shared_ptr\<SSLSocket\> AcceptSSL(const Socket &soc,SSLSocket::Mode soc_mode = SSLSocket::Mode::kQuickly)
 - 参数：
     - `soc`：普通套接字对象。
+    - `soc_mode`: ssl soc 类型。
 - 返回值：指向 `SSLSocket` 的智能指针。
 - 作用：接受一个连接并创建一个 SSL 套接字。
 ## int Close()

docs/cppnet/ssl/ssl_socket.md

@@ -1,8 +1,11 @@
 # cppnet::SSLSocket
-## SSLSocket(SSL \*ssl, const Socket &soc)
+## SSLSocket(SSL \*ssl, const Socket &soc, Mode mode = Mode::kQuickly)
 - 参数：
     - `ssl`：OpenSSL 的 SSL 指针。
     - `soc`：普通套接字对象。
+    - `mode`: socket 模式
+        - kQuickly: 快捷模式, 默认此模式, 多线程并发操作同一个 soc 可能段错误。
+        - kSafely:  安全模式, 此时对这个 socket 的操作都会加锁, 并发安全。
 - 返回值：无
 - 作用：构造一个 SSLSocket 对象，关联给定的 SSL 指针和套接字。
 ## int Connect(Address &addr) override

src/cppnet/http/server/http_server.cpp

@@ -2,7 +2,6 @@
 #include "../../utils/const.hpp"
 #include "../../utils/file.hpp"
 #include "filter/http_method_filter.hpp"
-#include "utils/date.hpp"
 #include <functional>
 #include <memory>
 #include <string>
@@ -251,7 +250,8 @@ void HttpServer::HandleAccept(TcpServer &server, Socket &event_soc) {
   Address recv_addr;
   auto rc = event_soc.GetAddr(recv_addr);
   if (rc != RC::kSuccess) {
-    logger_->Error("[event_soc.GetAddr]:" + event_soc.err_msg());
+    logger_->Error("[event_soc.GetAddr]:" + event_soc.err_msg() +
+                   " soc:" + std::to_string(event_soc.fd()));
     server.RemoveSoc(event_soc);
     event_soc.Close();
     return;
@@ -270,7 +270,8 @@ void HttpServer::HandleAccept(TcpServer &server, Socket &event_soc) {
   if (ssl_context_) {
     auto ssl_socket = ssl_context_->AcceptSSL(event_soc);
     if (ssl_socket == nullptr) {
-      logger_->Error("[ssl_context.AcceptSSL]:" + ssl_context_->err_msg());
+      logger_->Error("[ssl_context.AcceptSSL]:" + ssl_context_->err_msg() +
+                     " soc:" + std::to_string(event_soc.fd()));
       server.RemoveSoc(event_soc);
       event_soc.Close();
       return;
@@ -298,8 +299,6 @@ void HttpServer::HandleRead(TcpServer &server, Socket &event_soc) {
   const std::string kCRLF = "\r\n";
   const std::string kEndl = "\n";
   std::shared_ptr<Socket> soc = nullptr;
-  Address recv_addr;
-  event_soc.GetAddr(recv_addr);
 
 #ifdef CPPNET_OPENSSL
   if (ssl_context_) {
@@ -322,17 +321,19 @@ void HttpServer::HandleRead(TcpServer &server, Socket &event_soc) {
   std::string buf;
   auto len = soc->ReadUntil(buf, kCRLF + kCRLF);
   if (len == 0) {
-    logger_->Error("[soc.ReadUntil]: peer close before read complete");
+    logger_->Error("[soc.ReadUntil]: peer close before read complete ,soc:" +
+                   std::to_string(soc->fd()));
     server.RemoveSoc(event_soc);
     soc->Close();
     return;
   }
   if (len < 0) {
     if (soc->err_no() == EAGAIN || soc->err_no() == EWOULDBLOCK) {
-      logger_->Error("[soc.ReadUntil]: read timeout");
+      logger_->Error("[soc.ReadUntil]: read timeout ,soc:" +
+                     std::to_string(soc->fd()));
     } else {
       logger_->Error("[soc.ReadUntil]:" + soc->err_msg() +
-                     " soc:" + std::to_string(event_soc.fd()));
+                     " soc:" + std::to_string(soc->fd()));
     }
     server.RemoveSoc(event_soc);
     soc->Close();
@@ -427,9 +428,9 @@ void HttpServer::HandleRead(TcpServer &server, Socket &event_soc) {
   }
 
   // standardized log format
-  logger_->Info("[cppnet] " + Date::GetNow() + " | " +
-                std::to_string(int(resp.status_code())) + " | " +
-                recv_addr.ToString() + " | " +
+  logger_->Info("[cppnet] | " + std::to_string(int(resp.status_code())) +
+                " | " + soc->GetAddr().ToString() + " " +
+                std::to_string(soc->fd()) + " | " +
                 HttpMethodUtil::ConvertToStr(method) + " | " + path);
   logger_->Debug(
       "resp: " + HttpStatusCodeUtil::ConvertToStr(resp.status_code()) +

src/cppnet/log/file_logger.cpp

@@ -1,6 +1,7 @@
 #include "file_logger.hpp"
 #include "../utils/const.hpp"
 #include "../utils/file.hpp"
+#include "utils/date.hpp"
 
 namespace cppnet {
 
@@ -59,39 +60,39 @@ void FileLogger::Debug(const std::string &msg) {
   if (level_ > Logger::Level::kDebug || cur_buffer_ == nullptr) {
     return;
   }
-  cur_buffer_->data += "[DEBUG]" + GetNowTime() + "|" + msg + "\n";
+  cur_buffer_->data += "[DEBUG]" + Date::GetNow() + "|" + msg + "\n";
   CheckFlush();
 }
 
 void FileLogger::Info(const std::string &msg) {
   if (level_ > Logger::Level::kInfo || cur_buffer_ == nullptr) {
     return;
   }
-  cur_buffer_->data += "[INFO]" + GetNowTime() + "|" + msg + "\n";
+  cur_buffer_->data += "[INFO]" + Date::GetNow() + "|" + msg + "\n";
   CheckFlush();
 }
 
 void FileLogger::Warn(const std::string &msg) {
   if (level_ > Logger::Level::kWarn || cur_buffer_ == nullptr) {
     return;
   }
-  cur_buffer_->data += "[WARN]" + GetNowTime() + "|" + msg + "\n";
+  cur_buffer_->data += "[WARN]" + Date::GetNow() + "|" + msg + "\n";
   CheckFlush();
 }
 
 void FileLogger::Error(const std::string &msg) {
   if (level_ > Logger::Level::kError || cur_buffer_ == nullptr) {
     return;
   }
-  cur_buffer_->data += "[ERROR]" + GetNowTime() + "|" + msg + "\n";
+  cur_buffer_->data += "[ERROR]" + Date::GetNow() + "|" + msg + "\n";
   CheckFlush();
 }
 
 void FileLogger::Fatal(const std::string &msg) {
   if (level_ > Logger::Level::kFatal || cur_buffer_ == nullptr) {
     return;
   }
-  cur_buffer_->data += "[FATAL]" + GetNowTime() + "|" + msg + "\n";
+  cur_buffer_->data += "[FATAL]|" + msg + "\n";
   CheckFlush();
 }
 
@@ -135,12 +136,4 @@ void FileLogger::FlushBuffer(std::string file_path,
   buffer->last_flush_time = time(nullptr);
 }
 
-std::string FileLogger::GetNowTime() {
-  static char buf[64];
-  time_t now = time(nullptr);
-  struct tm *tm_now = localtime(&now);
-  strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tm_now);
-  return std::string(buf);
-}
-
 } // namespace cppnet

src/cppnet/log/file_logger.hpp

@@ -61,7 +61,6 @@ class FileLogger : public Logger {
   static void FlushBuffer(std::string file_path,
                           std::shared_ptr<Buffer> buffer);
   void CheckFlush();
-  std::string GetNowTime();
 
 private:
   std::string file_path_;