feat:add date class

Author: chenxuan520

.github/workflows/test.yml

@@ -27,8 +27,9 @@ jobs:
           cmake -G "MinGW Makefiles" .. -DENABLE_SSL=OFF
           make
           cd ..
-          wget https://raw.githubusercontent.com/chenxuan520/gh-action-shell/main/cmd_retry.ps1
-          ./cmd_retry.ps1 ./bin/test_bin.exe 2
+          ./bin/test_bin.exe
+          # Invoke-WebRequest -Uri "https://raw.githubusercontent.com/chenxuan520/gh-action-shell/main/cmd_retry.ps1" -OutFile ".\cmd_retry.ps1" -UseBasicParsing
+          # ./cmd_retry.ps1 ./bin/test_bin.exe 2
 
       - name: Run test #需要执行的命令
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'

README.en.md

@@ -398,6 +398,8 @@ cppnet
 │   └── timer.hpp
 └── utils
     ├── const.hpp
+    ├── date.cpp
+    ├── date.hpp
     ├── file.cpp
     ├── file.hpp
     ├── host.cpp

README.md

@@ -398,6 +398,8 @@ cppnet
 │   └── timer.hpp
 └── utils
     ├── const.hpp
+    ├── date.cpp
+    ├── date.hpp
     ├── file.cpp
     ├── file.hpp
     ├── host.cpp

demo/web-server/config.json

@@ -4,6 +4,7 @@
 	"is_background":false,
 	"is_guard":false,
 	"log_path":"./server.log",
+	"log_level": 0,
 	"redirects":[
 		{
 			"route":"/hello",

demo/web-server/config/config.hpp

@@ -46,6 +46,7 @@ struct Config {
   bool is_background = false;
   bool is_guard = false;
   std::string log_path = "";
+  int log_level = 0;
   std::vector<RedirectConfig> redirects;
   std::vector<StaticConfig> statics;
   SSLConfig ssl;
@@ -55,6 +56,7 @@ struct Config {
     is_background = json["is_background"].bool_val;
     is_guard = json["is_guard"].bool_val;
     log_path = json["log_path"].str_val;
+    log_level = json["log_level"].int_val;
     for (int i = 0; i < json["redirects"].arr.size(); i++) {
       RedirectConfig redirect;
       redirect.ParseFromJson(json["redirects"][i]);

demo/web-server/main.cpp

@@ -110,6 +110,10 @@ void RunWithConfig(Config &config) {
     std::shared_ptr<MultiLogger> logger = std::make_shared<MultiLogger>();
     auto std_logger = make_shared<StdLogger>();
     auto file_logger = make_shared<FileLogger>();
+
+    std_logger->set_level(Logger::Level(config.log_level));
+    logger->set_level(Logger::Level(config.log_level));
+
     file_logger->Init(config.log_path);
     logger->Init({std_logger, file_logger});
 

docs/cppnet/utils/date.md

@@ -0,0 +1,6 @@
+# cppnet::Date
+## static std::string GetNow(std::string format = "%Y/%m/%d %H:%M:%S")
+- 参数：`std::string format`，日期时间的格式字符串。
+- 返回值：`std::string`类型，按照指定格式表示的当前日期和时间。
+- 作用：获取当前的日期和时间，并按照指定的格式转换为字符串返回。
+- 说明：默认格式为"%Y/%m/%d %H:%M:%S"（其中%Y表示四位年份，%m表示两位月份，%d表示两位日期，%H表示24小时制小时，%M表示分钟，%S表示秒）。

src/cppnet/http/server/http_server.cpp

@@ -2,6 +2,7 @@
 #include "../../utils/const.hpp"
 #include "../../utils/file.hpp"
 #include "filter/http_method_filter.hpp"
+#include "utils/date.hpp"
 #include <functional>
 #include <memory>
 #include <string>
@@ -114,39 +115,42 @@ int HttpGroup::StaticDir(
         auto route = ctx.req().route().GetPath();
         auto pos = route.find(path);
         if (pos == std::string::npos) {
-          logger_->Warn("[logicerr]:static dir path error " +
-                        ctx.req().route().GetPath() + " " + path);
+          logger_->Debug("[StaticDir]:static dir path error " +
+                         ctx.req().route().GetPath() + " " + path);
           ctx.resp().NotFound();
+          ctx.Abort();
           return;
         }
         auto aim_path = route.substr(pos + path.size());
         // avoid path like /static/../xxx
         if (aim_path.find("..") != std::string::npos) {
-          logger_->Warn("[logicerr]:static dir path error " + aim_path);
+          logger_->Debug("[StaticDir]:static dir path error " + aim_path);
           ctx.resp().NotFound();
+          ctx.Abort();
           return;
         }
         auto file_path = dir_path + "/" + aim_path;
         auto exist = File::Exist(file_path);
         if (!exist) {
-          logger_->Warn("[logicerr]:static dir not exist " + file_path);
-          ctx.Next();
+          logger_->Debug("[StaticDir]:static dir not exist " + file_path);
           return;
         }
         auto rc = File::Read(file_path, ctx.resp().body());
         if (rc != kSuccess) {
-          logger_->Error(file_path + " read error");
+          logger_->Error("[StaticDir]:" + file_path + " read error");
           ctx.resp().NotFound();
+          ctx.Abort();
           return;
         }
-        logger_->Info("static_dir: return static dir success " + file_path);
+        logger_->Debug("[StaticDir]: return static dir success " + file_path);
         ctx.resp().header().SetLongConnection(true);
         ctx.resp().Success(
             HttpHeader::ConvertFileType(File::Suffix(file_path)));
+        ctx.Abort();
       },
       new_filters, false);
   if (rc != kSuccess) {
-    logger_->Error("[logicerr]:register static dir error");
+    logger_->Error("[StaticDir]:register static dir error");
     return rc;
   }
   return kSuccess;
@@ -164,29 +168,30 @@ int HttpGroup::StaticFile(
       [=](HttpContext &ctx) {
         auto exist = File::Exist(file_path);
         if (!exist) {
-          logger_->Warn("[logicerr]:static file not exist " + file_path);
+          logger_->Debug("[StaticFile]:static file not exist " + file_path);
           ctx.resp().NotFound();
-          ctx.Next();
           return;
         }
         auto rc = File::Read(file_path, ctx.resp().body());
         if (rc != kSuccess) {
-          logger_->Error("[logicerr]:" + file_path + " read error");
+          logger_->Error("[StaticFile]:" + file_path + " read error");
           ctx.resp().NotFound();
+          ctx.Abort();
           return;
         }
-        logger_->Info("static_file: return static file success " + file_path);
+        logger_->Debug("[StaticFile]: return static file success " + file_path);
         ctx.resp().header().SetLongConnection(true);
 
         auto suffix = File::Suffix(file_path);
         auto type_str = HttpHeader::ConvertToStr(
             HttpHeader::ConvertFileType(suffix), suffix);
         ctx.resp().header().SetContentType(type_str);
         ctx.resp().Success();
+        ctx.Abort();
       },
       new_filters);
   if (rc != kSuccess) {
-    logger_->Error("[logicerr]:register static file error");
+    logger_->Error("[StaticFile]:register static file error");
     return rc;
   }
   return kSuccess;
@@ -218,7 +223,7 @@ int HttpServer::Run() {
     logger_->Info("http server run in http://" + server_.addr().ToString());
   }
 #else
-  logger_->Info("http server run in http://" + server_.addr().ToString());
+  logger_->Debug("http server run in http://" + server_.addr().ToString());
 #endif
   auto rc = server_.EventLoop();
   if (rc != RC::kSuccess) {
@@ -251,8 +256,8 @@ void HttpServer::HandleAccept(TcpServer &server, Socket &event_soc) {
     event_soc.Close();
     return;
   }
-  logger_->Info("accept from " + recv_addr.ToString() +
-                " soc: " + std::to_string(event_soc.fd()));
+  logger_->Debug("accept from " + recv_addr.ToString() +
+                 " soc: " + std::to_string(event_soc.fd()));
 
   if (read_timeout_.first != 0 || read_timeout_.second != 0) {
     event_soc.SetReadTimeout(read_timeout_.first, read_timeout_.second);
@@ -278,8 +283,8 @@ void HttpServer::HandleAccept(TcpServer &server, Socket &event_soc) {
 void HttpServer::HandleLeave(TcpServer &server, Socket &event_soc) {
   Address recv_addr;
   event_soc.GetAddr(recv_addr);
-  logger_->Info("leave from " + recv_addr.ToString() +
-                " soc: " + std::to_string(event_soc.fd()));
+  logger_->Debug("leave from " + recv_addr.ToString() +
+                 " soc: " + std::to_string(event_soc.fd()));
 #ifdef CPPNET_OPENSSL
   if (ssl_context_ &&
       ssl_sockets_map_.find(event_soc.fd()) != ssl_sockets_map_.end()) {
@@ -293,6 +298,9 @@ 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_) {
     if (ssl_sockets_map_.find(event_soc.fd()) != ssl_sockets_map_.end()) {
@@ -340,7 +348,7 @@ void HttpServer::HandleRead(TcpServer &server, Socket &event_soc) {
     resp.BadRequest(req.err_msg());
     resp.Build(resp_buf);
     soc->Write(resp_buf);
-    logger_->Info(
+    logger_->Debug(
         "resp: " + HttpStatusCodeUtil::ConvertToStr(resp.status_code()) +
         " soc:" + std::to_string(event_soc.fd()) + kEndl);
     server.RemoveSoc(event_soc);
@@ -416,6 +424,12 @@ void HttpServer::HandleRead(TcpServer &server, Socket &event_soc) {
     soc->Close();
     return;
   }
+
+  // standardized log format
+  logger_->Info("[cppnet] " + Date::GetNow() + " | " +
+                std::to_string(int(resp.status_code())) + " | " +
+                recv_addr.ToString() + " | " +
+                HttpMethodUtil::ConvertToStr(method) + " | " + path);
   logger_->Debug(
       "resp: " + HttpStatusCodeUtil::ConvertToStr(resp.status_code()) +
       " soc:" + std::to_string(event_soc.fd()) + kEndl);

src/cppnet/utils/date.cpp

@@ -0,0 +1,24 @@
+#include "date.hpp"
+
+#include <chrono>
+#include <ctime>
+#include <iomanip>
+#include <sstream>
+namespace cppnet {
+
+std::string Date::GetNow(std::string format) {
+  auto now = std::chrono::system_clock::now();
+  std::time_t now_time = std::chrono::system_clock::to_time_t(now);
+  std::tm local_tm;
+#ifdef _WIN32
+  localtime_s(&local_tm, &now_time);
+#else
+  localtime_r(&now_time, &local_tm);
+#endif
+
+  std::stringstream ss;
+  ss << std::put_time(&local_tm, format.c_str());
+  return ss.str();
+}
+
+} // namespace cppnet

src/cppnet/utils/date.hpp

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <string>
+
+namespace cppnet {
+class Date {
+public:
+  /*
+   * @brief Get the current date and time in the specified format
+   * @param format The format of the date and time
+   * @return The current date and time in the specified format
+   * @note The default format is "%Y/%m/%d %H:%M:%S"
+   */
+  static std::string GetNow(std::string format = "%Y/%m/%d %H:%M:%S");
+};
+} // namespace cppnet