file_writer: Move to ulog::file namespace

Author: shawnfeng0

examples/unix/ulog_example_rotate_file.cc

@@ -39,7 +39,7 @@ static void OutputFunc() {
 }
 
 int main() {
-  std::unique_ptr<ulog::WriterInterface> file_writer = std::make_unique<ulog::FileLimitWriter>(100 * 1024);
+  std::unique_ptr<ulog::file::WriterInterface> file_writer = std::make_unique<ulog::file::FileLimitWriter>(100 * 1024);
   ulog::file::AsyncRotatingFile<ulog::mpsc::Mq> async_rotate(std::move(file_writer), 65536 * 2, "/tmp/ulog/test.txt", 5,
                                                              true, std::chrono::seconds{1}, ulog::file::kRename);
 

include/ulog/file/file_writer.h

@@ -7,7 +7,7 @@
 #include "file.h"
 #include "writer_interface.h"
 
-namespace ulog {
+namespace ulog::file {
 
 class FileLimitWriter final : public WriterInterface {
  public:
@@ -77,4 +77,4 @@ class FileLimitWriter final : public WriterInterface {
   std::FILE *file_{nullptr};
   size_t file_write_size_{0};
 };
-}  // namespace ulog
+}  // namespace ulog::file

include/ulog/file/writer_interface.h

@@ -8,7 +8,7 @@
 
 #include "ulog/status.h"
 
-namespace ulog {
+namespace ulog::file {
 
 class WriterInterface {
  public:
@@ -51,4 +51,4 @@ class WriterInterface {
    */
   virtual Status Write(const void* data, std::size_t len) = 0;
 };
-}  // namespace ulog
+}  // namespace ulog::file

include/ulog/file/zstd_file_writer.h

@@ -7,7 +7,7 @@
 #include "file.h"
 #include "writer_interface.h"
 
-namespace ulog {
+namespace ulog::file {
 
 class ZstdLimitFile final : public WriterInterface {
  public:
@@ -143,4 +143,4 @@ class ZstdLimitFile final : public WriterInterface {
   std::vector<uint8_t> zstd_out_buffer_;
 };
 
-}  // namespace ulog
+}  // namespace ulog::file

tools/logrotate/logrotate.cc

@@ -70,7 +70,7 @@ int main(const int argc, char *argv[]) {
   const auto flush_interval = to_chrono_time(args_info.flush_interval_arg);
   std::string filepath = args_info.file_path_arg;
 
-  std::unique_ptr<ulog::WriterInterface> file_writer;
+  std::unique_ptr<ulog::file::WriterInterface> file_writer;
   // Zstd compression
   if (args_info.zstd_compress_flag) {
     // Append .zst extension if not present
@@ -81,20 +81,20 @@ int main(const int argc, char *argv[]) {
     // Parse zstd parameters
     if (args_info.zstd_params_given) {
       const std::map<std::string, std::string> result = ParseParametersMap(args_info.zstd_params_arg);
-      file_writer = std::make_unique<ulog::ZstdLimitFile>(
+      file_writer = std::make_unique<ulog::file::ZstdLimitFile>(
           file_size, result.count("level") ? std::stoi(result.at("level")) : ZSTD_DEFAULT_LEVEL,
           result.count("window-log") ? std::stoi(result.at("window-log")) : 0,
           result.count("chain-log") ? std::stoi(result.at("chain-log")) : 0,
           result.count("hash-log") ? std::stoi(result.at("hash-log")) : 0);
 
       // No zstd parameters
     } else {
-      file_writer = std::make_unique<ulog::ZstdLimitFile>(file_size);
+      file_writer = std::make_unique<ulog::file::ZstdLimitFile>(file_size);
     }
 
     // No compression
   } else {
-    file_writer = std::make_unique<ulog::FileLimitWriter>(file_size);
+    file_writer = std::make_unique<ulog::file::FileLimitWriter>(file_size);
   }
 
   const ulog::file::RotationStrategy rotation_strategy = std::string(args_info.rotation_strategy_arg) == "incremental"