27 add logmanager for open source version (#41)

* add LogManager
baidu · Jul 17, 2024 · a5fe961 · a5fe961
1 parent ffbb1e9
commit a5fe961
Show file tree

Hide file tree

Showing 51 changed files with 2,196 additions and 610 deletions.
diff --git a/BUILD b/BUILD
@@ -130,16 +130,36 @@ alias(
   actual = '//src/babylon/logging:async_file_appender',
 )
 
+alias(
+  name = 'logging_async_log_stream',
+  actual = '//src/babylon/logging:async_log_stream',
+)
+
 alias(
   name = 'logging_interface',
-  actual = '//src/babylon/logging:interface',
+  actual = '//src/babylon/logging:logger',
+)
+
+alias(
+  name = 'logging_log_entry',
+  actual = '//src/babylon/logging:log_entry',
 )
 
 alias(
   name = 'logging_log_stream',
   actual = '//src/babylon/logging:log_stream',
 )
 
+alias(
+  name = 'logging_logger',
+  actual = '//src/babylon/logging:logger',
+)
+
+alias(
+  name = 'logging_rolling_file_object',
+  actual = '//src/babylon/logging:rolling_file_object',
+)
+
 alias(
   name = 'move_only_function',
   actual = '//src/babylon:move_only_function',

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 
-project(babylon VERSION 1.2.3)
+project(babylon VERSION 1.3.0)
 
 include(CTest)                      # for BUILD_TESTING option
 include(CMakePackageConfigHelpers)  # for write_basic_package_version_file
@@ -99,6 +99,10 @@ if(BUILD_TESTING AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     IMPORT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/proto"
     PROTOC_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
   target_include_directories(babylon_test_proto PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
+  set_source_files_properties(
+    "${CMAKE_CURRENT_SOURCE_DIR}/test/logging/test_logger.cpp"
+    PROPERTIES COMPILE_FLAGS "-fno-access-control")
+
   foreach(SRC ${BABYLON_TEST_SRCS})
     string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}" "" TARGET_NAME ${SRC})
     string(REPLACE "/" "_" TARGET_NAME ${TARGET_NAME})

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
   name = 'babylon',
-  version = '1.2.3',
+  version = '1.3.0',
   compatibility_level = 1,
 )
 

diff --git a/copts.bzl b/copts.bzl
@@ -1,7 +1,7 @@
 BABYLON_GCC_COPTS = ['-Wall', '-Wextra']
 BABYLON_CLANG_COPTS = ['-faligned-new', '-Weverything', '-Wno-unknown-warning-option',
                        # 不保持老版本c++语法兼容
-                       '-Wno-c++98-compat', '-Wno-c++98-compat-pedantic',
+                       '-Wno-c++98-compat-pedantic', '-Wno-c99-designator',
                        # Boost Preprocessor中大量使用
                        '-Wno-disabled-macro-expansion',
                        # 未定义宏默认为0作为一个惯例特性保留使用
@@ -21,7 +21,7 @@ BABYLON_CLANG_COPTS = ['-faligned-new', '-Weverything', '-Wno-unknown-warning-op
                        # TODO(lijiang01): 逐步梳理清除
                        '-Wno-old-style-cast', '-Wno-shadow-field',
                        '-Wno-exit-time-destructors', '-Wno-sign-conversion',
-                       '-Wno-c++20-designator', '-Wno-shadow-field-in-constructor', '-Wno-gnu-anonymous-struct', '-Wno-nested-anon-types',
+                       '-Wno-shadow-field-in-constructor', '-Wno-gnu-anonymous-struct', '-Wno-nested-anon-types',
                        '-Wno-shadow-uncaptured-local', '-Wno-weak-vtables', '-Wno-float-conversion', '-Wno-switch-enum',
                        '-Wno-shadow', '-Wno-array-bounds-pointer-arithmetic', '-Wno-cast-align', '-Wno-vla-extension',
                        '-Wno-unneeded-member-function', '-Wno-deprecated-declarations']

diff --git a/src/babylon/BUILD b/src/babylon/BUILD
@@ -112,7 +112,7 @@ cc_library(
   strip_include_prefix = '//src',
   deps = [
     ':string_view',
-    '//src/babylon/logging:interface',
+    '//src/babylon/logging:logger',
     '@com_google_absl//absl/strings',
   ],
 )

diff --git a/src/babylon/anyflow/BUILD b/src/babylon/anyflow/BUILD
@@ -28,7 +28,7 @@ cc_library(
     '//src/babylon:any',
     '//src/babylon/concurrent:transient_topic',
     '//src/babylon:executor',
-    '//src/babylon/logging:interface',
+    '//src/babylon/logging:logger',
     '//src/babylon:move_only_function',
     '//src/babylon/reusable:manager',
     '//:boost.preprocessor',

diff --git a/src/babylon/anyflow/closure.hpp b/src/babylon/anyflow/closure.hpp
@@ -3,7 +3,7 @@
 #include "babylon/anyflow/closure.h"
 #include "babylon/anyflow/executor.h"
 #include "babylon/future.h"
-#include "babylon/logging/interface.h"
+#include "babylon/logging/logger.h"
 
 BABYLON_NAMESPACE_BEGIN
 namespace anyflow {

diff --git a/src/babylon/application_context.cpp b/src/babylon/application_context.cpp
@@ -1,6 +1,6 @@
 #include "babylon/application_context.h"
 
-#include "babylon/logging/interface.h" // BABYLON_LOG
+#include "babylon/logging/logger.h" // BABYLON_LOG
 
 BABYLON_NAMESPACE_BEGIN
 

diff --git a/src/babylon/application_context.h b/src/babylon/application_context.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "babylon/any.h"               // babylon::Any
-#include "babylon/logging/interface.h" // BABYLON_LOG
+#include "babylon/any.h"            // babylon::Any
+#include "babylon/logging/logger.h" // BABYLON_LOG
 
 // clang-format off
 #include BABYLON_EXTERNAL(absl/container/flat_hash_map.h) // absl::flat_hash_map

diff --git a/src/babylon/logging/BUILD b/src/babylon/logging/BUILD
@@ -7,9 +7,9 @@ load('//:copts.bzl', 'BABYLON_COPTS')
 cc_library(
   name = 'logging',
   deps = [
-    'async_file_appender',
-    'interface',
-    'log_stream',
+    'async_log_stream',
+    'logger',
+    'rolling_file_object',
   ]
 )
 
@@ -21,31 +21,97 @@ cc_library(
   includes = ['//src'],
   strip_include_prefix = '//src',
   deps = [
+    ':file_object',
+    ':log_entry',
     '//src/babylon/reusable:page_allocator',
   ],
 )
 
 cc_library(
-  name = 'interface',
-  srcs = ['interface.cpp'],
-  hdrs = ['interface.h'],
+  name = 'async_log_stream',
+  srcs = ['async_log_stream.cpp'],
+  hdrs = ['async_log_stream.h'],
   copts = BABYLON_COPTS,
   includes = ['//src'],
   strip_include_prefix = '//src',
   deps = [
-    ':log_stream',
+    ':async_file_appender',
+    ':logger',
+  ],
+)
+
+cc_library(
+  name = 'file_object',
+  srcs = ['file_object.cpp'],
+  hdrs = ['file_object.h'],
+  copts = BABYLON_COPTS,
+  strip_include_prefix = '//src',
+  deps = [
+    '//src/babylon:environment',
+  ],
+)
+
+cc_library(
+  name = 'log_entry',
+  srcs = ['log_entry.cpp'],
+  hdrs = ['log_entry.h'],
+  copts = BABYLON_COPTS,
+  strip_include_prefix = '//src',
+  deps = [
+    '//src/babylon/reusable:page_allocator',
+  ],
+)
+
+cc_library(
+  name = 'log_severity',
+  srcs = ['log_severity.cpp'],
+  hdrs = ['log_severity.h'],
+  copts = BABYLON_COPTS,
+  strip_include_prefix = '//src',
+  deps = [
+    '//src/babylon:string_view',
   ],
 )
 
 cc_library(
   name = 'log_stream',
   srcs = ['log_stream.cpp'],
-  hdrs = ['log_stream.h', 'log_stream.hpp'],
+  hdrs = ['log_stream.h'],
   copts = BABYLON_COPTS,
   includes = ['//src'],
   strip_include_prefix = '//src',
   deps = [
+    ':log_severity',
+    '//src/babylon:time',
     '//src/babylon:type_traits',
     '@com_google_absl//absl/strings:str_format',
   ],
 )
+
+cc_library(
+  name = 'logger',
+  srcs = ['logger.cpp', 'interface.cpp'],
+  hdrs = ['logger.h', 'interface.h'],
+  copts = BABYLON_COPTS,
+  strip_include_prefix = '//src',
+  deps = [
+    ':log_stream',
+    '//src/babylon/concurrent:thread_local',
+    '//src/babylon/concurrent:transient_hash_table',
+    '//src/babylon/reusable:page_allocator',
+  ],
+)
+
+cc_library(
+  name = 'rolling_file_object',
+  srcs = ['rolling_file_object.cpp'],
+  hdrs = ['rolling_file_object.h'],
+  copts = BABYLON_COPTS,
+  strip_include_prefix = '//src',
+  deps = [
+    ':file_object',
+    '//src/babylon:string_view',
+    '//src/babylon:time',
+    '@com_google_absl//absl/time',
+  ],
+)