Skip to content

Commit cc824c6

Browse files
committed
feat(logging): Use spdlog to replace simple_logger and screen_logger
1 parent 2bd86c1 commit cc824c6

139 files changed

Lines changed: 450 additions & 1277 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
CheckOptions: []
2121
# Disable some checks that are not useful for us now.
2222
# They are sorted by names, and should be consistent to build_tools/clang_tidy.py.
23-
Checks: 'abseil-*,boost-*,bugprone-*,cert-*,clang-analyzer-*,concurrency-*,cppcoreguidelines-*,darwin-*,fuchsia-*,google-*,hicpp-*,linuxkernel-*,llvm-*,misc-*,modernize-*,performance-*,portability-*,readability-*,-bugprone-easily-swappable-parameters,-bugprone-lambda-function-name,-bugprone-macro-parentheses,-cert-err58-cpp,-concurrency-mt-unsafe,-cppcoreguidelines-avoid-c-arrays,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-macro-usage,-cppcoreguidelines-non-private-member-variables-in-classes,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-union-access,-fuchsia-default-arguments-calls,-fuchsia-overloaded-operator,-fuchsia-statically-constructed-objects,-google-readability-avoid-underscore-in-googletest-name,-hicpp-avoid-c-arrays,-hicpp-named-parameter,-hicpp-no-array-decay,-llvm-include-order,-misc-definitions-in-headers,-misc-non-private-member-variables-in-classes,-modernize-avoid-c-arrays,-modernize-replace-disallow-copy-and-assign-macro,-modernize-use-trailing-return-type,-readability-function-cognitive-complexity,-readability-identifier-length,-readability-magic-numbers,-readability-named-parameter'
23+
Checks: 'abseil-*,boost-*,bugprone-*,cert-*,clang-analyzer-*,concurrency-*,cppcoreguidelines-*,darwin-*,fuchsia-*,google-*,hicpp-*,linuxkernel-*,llvm-*,misc-*,modernize-*,performance-*,portability-*,readability-*,-bugprone-easily-swappable-parameters,-bugprone-lambda-function-name,-bugprone-macro-parentheses,-cert-err58-cpp,-concurrency-mt-unsafe,-cppcoreguidelines-avoid-c-arrays,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-macro-usage,-cppcoreguidelines-non-private-member-variables-in-classes,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-union-access,-fuchsia-default-arguments-calls,-fuchsia-overloaded-operator,-fuchsia-statically-constructed-objects,-google-readability-avoid-underscore-in-googletest-name,-hicpp-avoid-c-arrays,-hicpp-named-parameter,-hicpp-no-array-decay,-llvm-header-guard,-llvm-include-order,-misc-definitions-in-headers,-misc-non-private-member-variables-in-classes,-modernize-avoid-c-arrays,-modernize-replace-disallow-copy-and-assign-macro,-modernize-use-trailing-return-type,-readability-function-cognitive-complexity,-readability-identifier-length,-readability-magic-numbers,-readability-named-parameter'
2424
ExtraArgs:
2525
ExtraArgsBefore: []
2626
FormatStyle: none

.licenserc.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,6 @@ header:
609609
- 'src/utils/ports.h'
610610
- 'src/utils/priority_queue.h'
611611
- 'src/utils/shared_io_service.h'
612-
- 'src/utils/simple_logger.cpp'
613-
- 'src/utils/simple_logger.h'
614612
- 'src/utils/singleton_store.h'
615613
- 'src/utils/strings.cpp'
616614
- 'src/utils/strings.h'
@@ -632,7 +630,6 @@ header:
632630
- 'src/utils/test/join_point_test.cpp'
633631
- 'src/utils/test/json_helper_test.cpp'
634632
- 'src/utils/test/lock.std.cpp'
635-
- 'src/utils/test/logger.cpp'
636633
- 'src/utils/test/logging.cpp'
637634
- 'src/utils/test/output_utils_test.cpp'
638635
- 'src/utils/test/priority_queue.cpp'

build_tools/clang_tidy.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ def tidy_on_path(path):
5353
"--",
5454
path]
5555
subprocess.check_call(cmd, stdout=patch_file, cwd=ROOT)
56-
# TODO(yingchun): some checks could be disabled before we fix them.
57-
# "-checks=-llvm-include-order,-modernize-concat-nested-namespaces,-cppcoreguidelines-macro-usage,-cppcoreguidelines-special-member-functions,-hicpp-special-member-functions,-bugprone-easily-swappable-parameters,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-c-arrays,-hicpp-avoid-c-arrays,-modernize-avoid-c-arrays,-llvm-header-guard,-cppcoreguidelines-pro-bounds-pointer-arithmetic",
5856
cmdline = ["clang-tidy-diff",
5957
"-clang-tidy-binary",
6058
"clang-tidy",
@@ -84,6 +82,7 @@ def tidy_on_path(path):
8482
"-hicpp-avoid-c-arrays,"
8583
"-hicpp-named-parameter,"
8684
"-hicpp-no-array-decay,"
85+
"-llvm-header-guard,"
8786
"-llvm-include-order,"
8887
"-misc-definitions-in-headers,"
8988
"-misc-non-private-member-variables-in-classes,"

cmake_modules/BaseFunctions.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,12 @@ function(dsn_setup_compiler_flags)
216216
if(${BUILD_TEST})
217217
add_definitions(-DMOCK_TEST)
218218
endif()
219+
# Use external fmt library instead of spdlog bundled.
220+
add_definitions(-DSPDLOG_FMT_EXTERNAL)
221+
# Define the compile time lowest log level to be active.
222+
add_definitions(-DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_DEBUG)
223+
# Compile with -fno-exceptions. Call abort() on any spdlog exceptions.
224+
add_definitions(-DSPDLOG_NO_EXCEPTIONS=ON)
219225

220226
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -gdwarf-4" CACHE STRING "" FORCE)
221227

src/aio/test/config.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ enable_default_app_mimic = true
4242
tool = nativerun
4343
pause_on_start = false
4444
logging_start_level = LOG_LEVEL_DEBUG
45-
logging_factory_name = dsn::tools::simple_logger
4645

4746
[aio_test]
4847
op_buffer_size = 12

src/base/test/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ set(MY_PROJ_LIBS
3535
lz4
3636
zstd
3737
snappy
38-
gtest)
38+
gtest
39+
spdlog)
3940

4041
set(MY_BOOST_LIBS Boost::system Boost::filesystem)
4142

src/base/test/config.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ tool = nativerun
3636
pause_on_start = false
3737

3838
logging_start_level = LOG_LEVEL_DEBUG
39-
logging_factory_name = dsn::tools::simple_logger
40-
;logging_factory_name = dsn::tools::screen_logger
4139
logging_flush_on_exit = true
4240

4341
enable_default_app_mimic = true

src/block_service/test/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ set(MY_PROJ_LIBS
3535
rocksdb
3636
lz4
3737
zstd
38-
snappy)
38+
snappy
39+
spdlog)
3940

4041
set(MY_BOOST_LIBS Boost::system Boost::filesystem)
4142

src/block_service/test/config-test.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ pools = THREAD_POOL_DEFAULT,THREAD_POOL_BLOCK_SERVICE
3737
tool = nativerun
3838
pause_on_start = false
3939
logging_start_level = LOG_LEVEL_DEBUG
40-
logging_factory_name = dsn::tools::simple_logger
4140

4241
[tools.simple_logger]
4342
fast_flush = true

src/client/test/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ set(MY_PROJ_LIBS
3030
rocksdb
3131
lz4
3232
zstd
33-
snappy)
33+
snappy
34+
spdlog)
3435

3536
set(MY_BOOST_LIBS Boost::system Boost::filesystem)
3637

0 commit comments

Comments
 (0)