Skip to content

Commit ead5d8a

Browse files
committed
feat(logging): Use spdlog to replace simple_logger and screen_logger
1 parent c99cfd6 commit ead5d8a

136 files changed

Lines changed: 444 additions & 1275 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.

.licenserc.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ header:
165165
- 'src/runtime/global_config.h'
166166
- 'src/common/gpid.h'
167167
- 'src/runtime/rpc/group_address.h'
168-
- 'src/utils/logging_provider.h'
169168
- 'src/runtime/rpc/message_parser.h'
170169
- 'src/runtime/rpc/network.h'
171170
- 'src/runtime/rpc/rpc_address.cpp'
@@ -617,8 +616,6 @@ header:
617616
- 'src/utils/lockp.std.h'
618617
- 'src/utils/logging.cpp'
619618
- 'src/utils/shared_io_service.h'
620-
- 'src/utils/simple_logger.cpp'
621-
- 'src/utils/simple_logger.h'
622619
- 'src/utils/strings.cpp'
623620
- 'src/utils/test/CMakeLists.txt'
624621
- 'src/utils/test/clear.sh'
@@ -637,7 +634,6 @@ header:
637634
- 'src/utils/test/join_point_test.cpp'
638635
- 'src/utils/test/json_helper_test.cpp'
639636
- 'src/utils/test/lock.std.cpp'
640-
- 'src/utils/test/logger.cpp'
641637
- 'src/utils/test/logging.cpp'
642638
- 'src/utils/test/output_utils_test.cpp'
643639
- 'src/utils/test/priority_queue.cpp'

build_tools/clang_tidy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ def tidy_on_path(path):
5454
path]
5555
subprocess.check_call(cmd, stdout=patch_file, cwd=ROOT)
5656
# 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",
57+
# "-checks=-llvm-include-order,-modernize-concat-nested-namespaces,-cppcoreguidelines-special-member-functions,-hicpp-special-member-functions"
5858
cmdline = ["clang-tidy-diff",
5959
"-clang-tidy-binary",
6060
"clang-tidy",
6161
"-p0",
6262
"-path", BUILD_PATH,
63-
"-checks=-cppcoreguidelines-pro-type-union-access,-llvm-include-order,-misc-definitions-in-headers,-modernize-use-trailing-return-type,-cppcoreguidelines-macro-usage,-modernize-replace-disallow-copy-and-assign-macro,-bugprone-macro-parentheses,-cppcoreguidelines-avoid-non-const-global-variables,-fuchsia-statically-constructed-objects,-fuchsia-overloaded-operator,-bugprone-easily-swappable-parameters,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,-hicpp-named-parameter,-readability-named-parameter,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-readability-function-cognitive-complexity,-cert-err58-cpp,-cppcoreguidelines-avoid-c-arrays,-hicpp-avoid-c-arrays,-modernize-avoid-c-arrays,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-type-const-cast,-concurrency-mt-unsafe,-readability-identifier-length,-fuchsia-default-arguments-calls,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers",
63+
"-checks=-cppcoreguidelines-pro-type-union-access,-llvm-include-order,-misc-definitions-in-headers,-modernize-use-trailing-return-type,-cppcoreguidelines-macro-usage,-modernize-replace-disallow-copy-and-assign-macro,-bugprone-macro-parentheses,-cppcoreguidelines-avoid-non-const-global-variables,-fuchsia-statically-constructed-objects,-fuchsia-overloaded-operator,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,-hicpp-named-parameter,-readability-named-parameter,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-readability-function-cognitive-complexity,-cert-err58-cpp,-cppcoreguidelines-avoid-c-arrays,-hicpp-avoid-c-arrays,-modernize-avoid-c-arrays,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-type-const-cast,-concurrency-mt-unsafe,-readability-identifier-length,-fuchsia-default-arguments-calls,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-llvm-header-guard",
6464
"-extra-arg=-language=c++",
6565
"-extra-arg=-std=c++17",
6666
"-extra-arg=-Ithirdparty/output/include"]

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/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/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/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_INFO
39-
logging_factory_name = dsn::tools::simple_logger
40-
;logging_factory_name = dsn::tools::screen_logger
4139
logging_flush_on_exit = false
4240

4341
enable_default_app_mimic = true

src/client_lib/pegasus_client_impl.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* under the License.
1818
*/
1919

20-
#include <fmt/core.h>
2120
#include <pegasus/error.h>
2221
#include <algorithm>
2322
#include <chrono>

src/common/test/config-test.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ cli_local = false
4747
cli_remote = false
4848

4949
logging_start_level = LOG_LEVEL_DEBUG
50-
logging_factory_name = dsn::tools::simple_logger
51-
5250

5351
[tools.simple_logger]
5452
fast_flush = true

src/failure_detector/test/config-test.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ tool = nativerun
7171
pause_on_start = false
7272

7373
logging_start_level = LOG_LEVEL_DEBUG
74-
logging_factory_name = dsn::tools::simple_logger
7574

7675

7776
[tools.simple_logger]

0 commit comments

Comments
 (0)