fix(log): 1.12.7, 解决AsyncFileSink的路径为相对路径时，出现xxx.latest.log软链接异常的问题

Author: hevake

modules/log/async_file_sink.cpp

@@ -85,9 +85,7 @@ void AsyncFileSink::cleanup()
 
 void AsyncFileSink::updateInnerValues()
 {
-    filename_prefix_ = file_path_ + '/' + file_prefix_ + '.';
-    sym_filename_ = filename_prefix_ + "latest.log";
-
+    sym_filepath_ = file_path_ + '/' + file_prefix_ + '.' + "latest.log";
     CHECK_CLOSE_RESET_FD(fd_);
 }
 
@@ -118,7 +116,7 @@ void AsyncFileSink::flush()
 bool AsyncFileSink::checkAndCreateLogFile()
 {
     if (fd_ >= 0) {
-        if (util::fs::IsFileExist(log_filename_))
+        if (util::fs::IsFileExist(log_filepath_))
             return true;
         CHECK_CLOSE_RESET_FD(fd_);
     }
@@ -137,31 +135,36 @@ bool AsyncFileSink::checkAndCreateLogFile()
         strftime(timestamp, sizeof(timestamp), "%Y%m%d_%H%M%S", &tm);
     }
 
-    std::string log_filename;
+    //! 生成新的日志文件名与路径
+    std::string log_filename; //! 日志文件名称，如：demo.20250402.123.log
+    std::string log_filepath; //! 日志文件路径，如：/var/log/demo.20250402.123.log
     int postfix = 0;
+
     do {
-        log_filename = filename_prefix_ + timestamp + '.' + std::to_string(pid_) + ".log";
+        log_filename = file_prefix_ + '.' + timestamp + '.' + std::to_string(pid_) + ".log";
         if (postfix != 0) {
             log_filename += '.';
             log_filename += std::to_string(postfix);
         }
+        log_filepath = file_path_ + '/' + log_filename;
         ++postfix;
-    } while (util::fs::IsFileExist(log_filename));    //! 避免在同一秒多次创建日志文件，都指向同一日志名
-    log_filename_ = std::move(log_filename);
+    } while (util::fs::IsFileExist(log_filepath));    //! 避免在同一秒多次创建日志文件，都指向同一日志名
+
+    log_filepath_ = std::move(log_filepath);
 
     int flags = O_CREAT | O_WRONLY | O_APPEND;
     if (file_sync_enable_)
         flags |= O_DSYNC;
 
-    fd_ = ::open(log_filename_.c_str(), flags, S_IRUSR | S_IWUSR);
+    fd_ = ::open(log_filepath_.c_str(), flags, S_IRUSR | S_IWUSR);
     if (fd_ < 0) {
-        cerr << "Err: open file " << log_filename_ << " fail. error:" << errno << ',' << strerror(errno) << endl;
+        cerr << "Err: open file " << log_filepath_ << " fail. error:" << errno << ',' << strerror(errno) << endl;
         return false;
     }
 
     total_write_size_ = 0;
-    util::fs::RemoveFile(sym_filename_, false);
-    util::fs::MakeSymbolLink(log_filename_, sym_filename_, false);
+    util::fs::RemoveFile(sym_filepath_, false);
+    util::fs::MakeSymbolLink(log_filename, sym_filepath_, false);
 
     return true;
 }

modules/log/async_file_sink.h

@@ -39,7 +39,7 @@ class AsyncFileSink : public AsyncSink {
     void setFilePrefix(const std::string &file_path);
     void setFileMaxSize(size_t max_size) { file_max_size_ = max_size; }
     void setFileSyncEnable(bool enable);
-    std::string currentFilename() const { return log_filename_; }
+    std::string currentFilePath() const { return log_filepath_; }
 
   protected:
     void updateInnerValues();
@@ -56,9 +56,8 @@ class AsyncFileSink : public AsyncSink {
     bool file_sync_enable_ = false;
     pid_t pid_ = 0;
 
-    std::string filename_prefix_;
-    std::string sym_filename_;
-    std::string log_filename_;
+    std::string log_filepath_;
+    std::string sym_filepath_;
 
     std::vector<char> buffer_;
 

modules/log/async_file_sink_test.cpp

@@ -103,10 +103,10 @@ TEST(AsyncFileSink, RemoveLogFileDuringWriting)
     ch.setFilePath("/tmp/tbox");
     ch.setFilePrefix("remove_log_file_during_writing");
     ch.enable();
-    util::fs::RemoveFile(ch.currentFilename());
+    util::fs::RemoveFile(ch.currentFilePath());
     LogInfo("Hello");
     std::this_thread::sleep_for(std::chrono::seconds(1));
-    EXPECT_TRUE(util::fs::IsFileExist(ch.currentFilename()));
+    EXPECT_TRUE(util::fs::IsFileExist(ch.currentFilePath()));
     ch.cleanup();
 }
 
@@ -118,7 +118,7 @@ TEST(AsyncFileSink, Truncate)
     ch.setFilePath("/tmp/tbox");
     ch.setFilePrefix("truncate");
     ch.enable();
-    util::fs::RemoveFile(ch.currentFilename());
+    util::fs::RemoveFile(ch.currentFilePath());
 
     std::string tmp(200, 'x');
     LogInfo("%s", tmp.c_str());

version.mk

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