mirror of
https://github.com/gabime/spdlog.git
synced 2026-04-10 11:34:29 +08:00
* docs(tasks): v1.x inventory, triage template, merge report; update task checklist - Record merge-base and export v1-only commits (v2..v1) - Document failed merge attempt: v2 file tree diverges from v1 - Mark completed checklist items 0.x, 1.x, merge report draft (5.2) Made-with: Cursor * fix(pattern): %z with UTC pattern time shows +00:00 (port v109a674b7) - z_formatter takes pattern_time_type; emit +00:00 when pattern uses UTC - Track port in tasks/commits-ported.txt and merge-report; update checklist Made-with: Cursor * fix(os): Windows utc_minutes_offset via mktime/_mkgmtime (port v1b656d1ce) - Replace GetTimeZoneInformation-based offset with v1.x mktime/_mkgmtime approach - Add tests/test_timezone.cpp and extend pattern_formatter tests; update os.h comment Made-with: Cursor * test(timezone): POSIX TZ with DST rules; include fcntl in tcp_client_unix (v1 ports) -0f7562a0: EST5EDT / IST-2IDT macros for POSIX vs Windows -d2100d5d: fcntl.h for Unix tcp client header (v2 path) Made-with: Cursor * feat(tcp): connect timeouts and socket IO timeouts; ci: checkout@v6 (v1 ports) -9ecdf5c8: connect_socket_with_timeout on Unix/Windows; tcp_sink timeout_ms -3c61b051: actions/checkout@v6 on all workflows - tcp_sink: remove duplicate #pragma once Made-with: Cursor * feat(dup_filter_sink): ctor with sink list (v145b67eee); add full v1 SHA triage table - tasks/v1-triage-complete.md: 245 commits PORTED/PENDING/N/A for PRD 3A tracking - Merge report and task checklist updated Made-with: Cursor * feat(level): case-insensitive level_from_str; cmake: BUILD_TYPE only if top-level (v1 ports) -566b2d14: common.cpp + test_misc (SUPERSEDED note ford5af52d9in triage) -dd3ca04a: guard default CMAKE_BUILD_TYPE for add_subdirectory consumers - Update v1-triage-complete.md counts and statuses Made-with: Cursor * v1 parity: MSVC UTF-8, ansicolor/syslog/os, getenv, triage docs - CMake: SPDLOG_MSVC_UTF8 + /utf-8 for real MSVC only - ansicolor: protected target_file_; fix set_color_mode_ lock nesting - os: drop redundant fileapi.h; spdlog::details::os::getenv via std::getenv - tests: stopwatch waits 500ms; includes/triage/commits-ported/merge-report updates - Reclassify superseded v1 SHAs (Sep, syslog, stopwatch ms, utf8 tests, etc.) Made-with: Cursor * parity: ringbuffer zero capacity, utf8 assert; v1 triage sync - ringbuffer_sink: throw if n_items==0 (#3436); test expects spdlog_ex - utf8_to_wstrbuf: assert compares int to static_cast<int>(target.size()) (#3479) - Triage: PORTEDad725d34getenv,677a2d93stopwatch,3f7e5028, a6215527; SUPERSEDEDa45c9390,eeb22c13,5673e9e5,fe4f9952,287333ee- tasks: 27 PORTED / 26 SUPERSEDED / 78 PENDING; merge-report + commits-ported Made-with: Cursor * docs(tasks): note regular commits and push after parity ports Made-with: Cursor * parity: dup_filter_sink notification level from last duplicate (#3390) - Remove notification_level ctor arg; track skipped_msg_log_level_ on duplicate skips - Test: skipped summary line uses same short level as duplicated messages - Triage:847db337PORTED; 28/26/77 counts; merge-report + commits-ported Made-with: Cursor * parity: UWP getenv (WINAPI_FAMILY); triage fmt/cfg/no-except - os_windows: detect non-desktop/UWP for empty getenv (#3489) - Triage: PORTED 8806ca65; SUPERSEDEDe3f5a4fee655dbb6; N/Aae1de0dc548b2642- Counts 29/28/116/72; merge-report + commits-ported Made-with: Cursor * parity: qt_sinks sign casts (#3487); triage9c582574superseded - qt_color_sink: qsizetype for UTF-8 color range lengths; index colors_ with size_t - SUPERSEDED:9c582574— os_unix utc_minutes_offset already matches #3366 - Counts 30/29/70; merge-report + commits-ported Made-with: Cursor * parity: SPDLOG_NO_TZ_OFFSET (#3483); triage #3360 superseded - CMake: option SPDLOG_NO_TZ_OFFSET; PUBLIC compile definition when ON - z_formatter: +??:?? when macro; else keep UTC +00:00 and local offset - utc_minutes_offset: stub on Unix/Windows when macro - test_pattern_formatter: %z UTC case matches placeholder when NO_TZ - SUPERSEDED10320184(ScopedPadder / %D already in v2) - Triage 31/30/68; merge-report + commits-ported Made-with: Cursor * triage: supersede5931a3d6ba50805747b7e7c7(already on v2 tree) Made-with: Cursor * tasks: sync 5.1 triage counts (33 superseded, 65 pending) Made-with: Cursor * parity: MSVC/clang hygiene #3515–#3519 #3521; triage batch - dup_filter_sink: filter_ const, const filter_duration (#3515) - logger: should_flush uses flush_level() (#3516) - daily_file_sink: new_filename locals (#3516) - spdlog::should_log(level log_level) (#3519) - example my_type value_ / ctor param (#3521) - Triage: PORTED1774e700309204d5f2a9dec0472945ba; N/Ad299603e57505989; SUPERSEDED1ef8d3ce8cfd4a7e; fixba508057row Made-with: Cursor * parity: udp_sink const udp_sink_config& (#3520); triagefc7e9c871685e694- dist_sink already used std::move(sinks) - SUPERSEDED: no common-inl.h on v2; log_with_format_ avoids fmt copy path (#3541) Made-with: Cursor * parity: README fmt::format_to (#3259); triage2670f47dd276069a951c5b99- Document ambiguous format_to fix in README user-defined type example - SUPERSEDED: z_formatter warning, fmt11 const formatter, rotate_now + test Made-with: Cursor * parity: lock rotate_now mutex (#3281); triagea2b42620f355b3d5d276069a- rotating_file_sink::rotate_now matches #3281 (sync with sink_it_) - SUPERSEDED: CMake 3.10..3.21 (v2 uses 3.23); daily test fmt::format; fmt11 const row Made-with: Cursor * parity: basic_file_sink::truncate (#3280); triage fwrite/fmt/test batch - truncate(): lock + file_helper::reopen(true) - test basic_file_sink_truncate - SUPERSEDED:b7e0e2c271925ca3fa6605dc885b547396c9a62b1e6250e1d7155530Made-with: Cursor * parity: test_sink/callback iterator cast (#3315); triage Catch2 #3038 - difference_type cast for formatted.end() - eol_len (ad0f31c0) - SUPERSEDED:c1569a3dCatch2 v3.5.0,73e2e02bwstr_to_utf8buf bounds Made-with: Cursor * parity: SPDLOG_WCHAR_CONSOLE WriteConsoleW path (#3092); triageb6da5944- WIN32 option SPDLOG_WCHAR_CONSOLE; SPDLOG_UTF8_TO_WCHAR_CONSOLE in private defs - wincolor print_range_: utf8_to_wstrbuf + WriteConsoleW when defined - N/A: async_msg flush_callback move-assign (no v1 shape on v2) Made-with: Cursor * triage: v1 async_logger/thread_pool + fmt 11.1 batch (15 SHAs) - N/A:fe79bfcc6725584easync tests16e0d2e763d18842d8e0ad461e7d7e073c23c27d- SUPERSEDED:faa0a7a985bdab0c276ee5f57f8060d596a8f625- Counts: 58 SUPERSEDED, 129 N/A, 17 PENDING; merge-report subsection Made-with: Cursor * Port v1 TSAN CMake (#3237); close 3A triage (MDC N/A, fmt 5A) Made-with: Cursor * docs(triage): note 3A table complete Made-with: Cursor * 5A: bundle fmt 12.1.0 (match v1.x), FMT_INSTALL, MSVC /wd4834, find_dependency(fmt 12) Made-with: Cursor * docs(5.4): migration and release notes for v1 parity integration branch Made-with: Cursor * docs: cross-link migration notes; refresh PRD/tasks/merge-report for completed 5A/3A Made-with: Cursor * revert: remove README and PRD cross-links to migration notes Made-with: Cursor * docs(merge-report): audit — add9fe79692to ports table; fix6004e3d1paths Made-with: Cursor * Remove tasks * PR comment fixes * Fix small random issues * Fix PR comments - un-remove the comment and allow any fmt library version --------- Co-authored-by: Jan Moravec <jan.moravec@hidglobal.com>
283 lines
11 KiB
C++
283 lines
11 KiB
C++
#ifdef _WIN32 // to prevent fopen warning on windows
|
|
#define _CRT_SECURE_NO_WARNINGS
|
|
#endif
|
|
|
|
#include <cstdio>
|
|
#include <cstring>
|
|
|
|
#include "includes.h"
|
|
#include "spdlog/details/os.h"
|
|
#include "spdlog/sinks/async_sink.h"
|
|
#include "spdlog/sinks/ostream_sink.h"
|
|
#include "test_sink.h"
|
|
|
|
template <class T>
|
|
std::string log_info(const T& what, spdlog::level logger_level = spdlog::level::info) {
|
|
std::ostringstream oss;
|
|
auto oss_sink = std::make_shared<spdlog::sinks::ostream_sink_mt>(oss);
|
|
|
|
spdlog::logger oss_logger("oss", oss_sink);
|
|
oss_logger.set_level(logger_level);
|
|
oss_logger.set_pattern("%v");
|
|
oss_logger.info(what);
|
|
|
|
return oss.str().substr(0, oss.str().length() - strlen(spdlog::details::os::default_eol));
|
|
}
|
|
|
|
TEST_CASE("basic_logging ", "[basic_logging]") {
|
|
// const char
|
|
REQUIRE(log_info("Hello") == "Hello");
|
|
REQUIRE(log_info("").empty());
|
|
|
|
// std::string
|
|
REQUIRE(log_info(std::string("Hello")) == "Hello");
|
|
REQUIRE(log_info(std::string()).empty());
|
|
}
|
|
|
|
TEST_CASE("log_levels", "[log_levels]") {
|
|
REQUIRE(log_info("Hello", spdlog::level::err).empty());
|
|
REQUIRE(log_info("Hello", spdlog::level::critical).empty());
|
|
REQUIRE(log_info("Hello", spdlog::level::info) == "Hello");
|
|
REQUIRE(log_info("Hello", spdlog::level::debug) == "Hello");
|
|
REQUIRE(log_info("Hello", spdlog::level::trace) == "Hello");
|
|
}
|
|
|
|
TEST_CASE("level_to_string_view", "[convert_to_string_view]") {
|
|
REQUIRE(spdlog::to_string_view(spdlog::level::trace) == "trace");
|
|
REQUIRE(spdlog::to_string_view(spdlog::level::debug) == "debug");
|
|
REQUIRE(spdlog::to_string_view(spdlog::level::info) == "info");
|
|
REQUIRE(spdlog::to_string_view(spdlog::level::warn) == "warning");
|
|
REQUIRE(spdlog::to_string_view(spdlog::level::err) == "error");
|
|
REQUIRE(spdlog::to_string_view(spdlog::level::critical) == "critical");
|
|
REQUIRE(spdlog::to_string_view(spdlog::level::off) == "off");
|
|
}
|
|
|
|
TEST_CASE("to_short_string_view", "[convert_to_short_c_str]") {
|
|
REQUIRE(spdlog::to_short_string_view(spdlog::level::trace) == "T");
|
|
REQUIRE(spdlog::to_short_string_view(spdlog::level::debug) == "D");
|
|
REQUIRE(spdlog::to_short_string_view(spdlog::level::info) == "I");
|
|
REQUIRE(spdlog::to_short_string_view(spdlog::level::warn) == "W");
|
|
REQUIRE(spdlog::to_short_string_view(spdlog::level::err) == "E");
|
|
REQUIRE(spdlog::to_short_string_view(spdlog::level::critical) == "C");
|
|
REQUIRE(spdlog::to_short_string_view(spdlog::level::off) == "O");
|
|
}
|
|
|
|
TEST_CASE("to_level_enum", "[convert_to_level_enum]") {
|
|
REQUIRE(spdlog::level_from_str("trace") == spdlog::level::trace);
|
|
REQUIRE(spdlog::level_from_str("debug") == spdlog::level::debug);
|
|
REQUIRE(spdlog::level_from_str("info") == spdlog::level::info);
|
|
REQUIRE(spdlog::level_from_str("warning") == spdlog::level::warn);
|
|
REQUIRE(spdlog::level_from_str("warn") == spdlog::level::warn);
|
|
REQUIRE(spdlog::level_from_str("error") == spdlog::level::err);
|
|
REQUIRE(spdlog::level_from_str("critical") == spdlog::level::critical);
|
|
REQUIRE(spdlog::level_from_str("off") == spdlog::level::off);
|
|
REQUIRE(spdlog::level_from_str("null") == spdlog::level::off);
|
|
REQUIRE(spdlog::level_from_str("TRACE") == spdlog::level::trace);
|
|
REQUIRE(spdlog::level_from_str("DEBUG") == spdlog::level::debug);
|
|
REQUIRE(spdlog::level_from_str("INFO") == spdlog::level::info);
|
|
REQUIRE(spdlog::level_from_str("WARNING") == spdlog::level::warn);
|
|
REQUIRE(spdlog::level_from_str("WARN") == spdlog::level::warn);
|
|
REQUIRE(spdlog::level_from_str("ERROR") == spdlog::level::err);
|
|
REQUIRE(spdlog::level_from_str("ERR") == spdlog::level::err);
|
|
REQUIRE(spdlog::level_from_str("CRITICAL") == spdlog::level::critical);
|
|
REQUIRE(spdlog::level_from_str("OFF") == spdlog::level::off);
|
|
REQUIRE(spdlog::level_from_str("TrAcE") == spdlog::level::trace);
|
|
REQUIRE(spdlog::level_from_str("DeBuG") == spdlog::level::debug);
|
|
}
|
|
|
|
TEST_CASE("copy_ctor", "[copy_ctor]") {
|
|
using spdlog::sinks::test_sink_mt;
|
|
auto test_sink = std::make_shared<test_sink_mt>();
|
|
auto logger = std::make_shared<spdlog::logger>("orig", test_sink);
|
|
logger->set_pattern("%v");
|
|
bool error_handled = false;
|
|
logger->set_error_handler([&error_handled](const std::string&) { error_handled = true; });
|
|
spdlog::logger copied = *logger;
|
|
|
|
REQUIRE(copied.name() == logger->name());
|
|
REQUIRE(logger->sinks() == copied.sinks());
|
|
REQUIRE(logger->log_level() == copied.log_level());
|
|
REQUIRE(logger->flush_level() == copied.flush_level());
|
|
|
|
logger->info("Some message 1");
|
|
copied.info("Some message 2");
|
|
|
|
REQUIRE(test_sink->lines().size() == 2);
|
|
REQUIRE(test_sink->lines()[0] == "Some message 1");
|
|
REQUIRE(test_sink->lines()[1] == "Some message 2");
|
|
|
|
// check that copied custom error handler was indeed copied
|
|
test_sink->set_exception(std::runtime_error("Some error"));
|
|
REQUIRE(error_handled == false);
|
|
copied.error("Some error");
|
|
REQUIRE(error_handled == true);
|
|
}
|
|
|
|
TEST_CASE("move_ctor", "[move_ctor]") {
|
|
auto log_level = spdlog::level::critical;
|
|
auto flush_level = spdlog::level::warn;
|
|
using spdlog::sinks::test_sink_mt;
|
|
auto test_sink = std::make_shared<test_sink_mt>();
|
|
auto logger = std::make_shared<spdlog::logger>("orig", test_sink);
|
|
logger->flush_on(flush_level);
|
|
logger->set_level(log_level);
|
|
logger->set_pattern("%v");
|
|
bool error_handled = false;
|
|
logger->set_error_handler([&error_handled](const std::string&) { error_handled = true; });
|
|
spdlog::logger moved = std::move(*logger);
|
|
|
|
REQUIRE(logger->name() == "");
|
|
REQUIRE(logger->sinks().empty());
|
|
REQUIRE(moved.name() == "orig");
|
|
REQUIRE(moved.sinks()[0].get() == test_sink.get());
|
|
REQUIRE(moved.log_level() == log_level);
|
|
REQUIRE(moved.flush_level() == flush_level);
|
|
|
|
logger->critical("Some message 1");
|
|
moved.critical("Some message 2");
|
|
|
|
REQUIRE(test_sink->lines().size() == 1);
|
|
REQUIRE(test_sink->lines()[0] == "Some message 2");
|
|
|
|
// check that copied custom error handler was indeed copied
|
|
test_sink->set_exception(std::runtime_error("Some error"));
|
|
REQUIRE(error_handled == false);
|
|
moved.critical("Some error");
|
|
REQUIRE(error_handled == true);
|
|
}
|
|
|
|
TEST_CASE("clone-logger", "[clone]") {
|
|
using spdlog::sinks::test_sink_mt;
|
|
auto test_sink = std::make_shared<test_sink_mt>();
|
|
auto logger = std::make_shared<spdlog::logger>("orig", test_sink);
|
|
logger->set_pattern("%v");
|
|
bool error_handled = false;
|
|
logger->set_error_handler([&error_handled](const std::string&) { error_handled = true; });
|
|
auto cloned = logger->clone("clone");
|
|
|
|
REQUIRE(cloned->name() == "clone");
|
|
REQUIRE(logger->sinks() == cloned->sinks());
|
|
REQUIRE(logger->log_level() == cloned->log_level());
|
|
REQUIRE(logger->flush_level() == cloned->flush_level());
|
|
|
|
logger->info("Some message 1");
|
|
cloned->info("Some message 2");
|
|
|
|
REQUIRE(test_sink->lines().size() == 2);
|
|
REQUIRE(test_sink->lines()[0] == "Some message 1");
|
|
REQUIRE(test_sink->lines()[1] == "Some message 2");
|
|
|
|
// check that cloned custom error handler was indeed cloned
|
|
test_sink->set_exception(std::runtime_error("Some error"));
|
|
REQUIRE(error_handled == false);
|
|
cloned->error("Some error");
|
|
REQUIRE(error_handled == true);
|
|
}
|
|
|
|
TEST_CASE("clone async", "[clone]") {
|
|
using spdlog::sinks::test_sink_mt;
|
|
auto test_sink = std::make_shared<test_sink_mt>();
|
|
{
|
|
auto cfg = spdlog::sinks::async_sink::config();
|
|
cfg.sinks.push_back(test_sink);
|
|
auto async_sink = spdlog::sinks::async_sink::with<test_sink_mt>();
|
|
auto logger = spdlog::create<spdlog::sinks::async_sink>("orig", cfg);
|
|
logger->set_pattern("*** %v ***");
|
|
auto cloned = logger->clone("clone");
|
|
REQUIRE(cloned->name() == "clone");
|
|
REQUIRE(logger->sinks() == cloned->sinks());
|
|
REQUIRE(logger->log_level() == cloned->log_level());
|
|
REQUIRE(logger->flush_level() == cloned->flush_level());
|
|
|
|
logger->info("Some message 1");
|
|
cloned->info("Some message 2");
|
|
}
|
|
REQUIRE(test_sink->lines().size() == 2);
|
|
REQUIRE(test_sink->lines()[0] == "*** Some message 1 ***");
|
|
REQUIRE(test_sink->lines()[1] == "*** Some message 2 ***");
|
|
}
|
|
|
|
TEST_CASE("global logger API", "[global logger]") {
|
|
std::ostringstream oss;
|
|
auto oss_sink = std::make_shared<spdlog::sinks::ostream_sink_mt>(oss);
|
|
|
|
spdlog::set_global_logger(std::make_shared<spdlog::logger>("oss", oss_sink));
|
|
spdlog::set_pattern("*** %v");
|
|
|
|
spdlog::global_logger()->set_level(spdlog::level::trace);
|
|
spdlog::trace("hello trace");
|
|
REQUIRE(oss.str() == "*** hello trace" + std::string(spdlog::details::os::default_eol));
|
|
|
|
oss.str("");
|
|
spdlog::debug("hello debug");
|
|
REQUIRE(oss.str() == "*** hello debug" + std::string(spdlog::details::os::default_eol));
|
|
|
|
oss.str("");
|
|
spdlog::info("Hello");
|
|
REQUIRE(oss.str() == "*** Hello" + std::string(spdlog::details::os::default_eol));
|
|
|
|
oss.str("");
|
|
spdlog::warn("Hello again {}", 2);
|
|
REQUIRE(oss.str() == "*** Hello again 2" + std::string(spdlog::details::os::default_eol));
|
|
|
|
oss.str("");
|
|
spdlog::critical(std::string("some string"));
|
|
REQUIRE(oss.str() == "*** some string" + std::string(spdlog::details::os::default_eol));
|
|
|
|
oss.str("");
|
|
spdlog::set_level(spdlog::level::info);
|
|
spdlog::debug("should not be logged");
|
|
REQUIRE(oss.str().empty());
|
|
spdlog::set_pattern("%v");
|
|
}
|
|
|
|
#if defined(_WIN32)
|
|
TEST_CASE("utf8 to utf16 conversion using windows api", "[windows utf]") {
|
|
spdlog::wmemory_buf_t buffer;
|
|
|
|
spdlog::details::os::utf8_to_wstrbuf("", buffer);
|
|
REQUIRE(std::wstring(buffer.data(), buffer.size()) == std::wstring(L""));
|
|
|
|
spdlog::details::os::utf8_to_wstrbuf("abc", buffer);
|
|
REQUIRE(std::wstring(buffer.data(), buffer.size()) == std::wstring(L"abc"));
|
|
|
|
spdlog::details::os::utf8_to_wstrbuf("\xc3\x28", buffer); // Invalid UTF-8 sequence.
|
|
REQUIRE(std::wstring(buffer.data(), buffer.size()) == std::wstring(L"\xfffd("));
|
|
|
|
spdlog::details::os::utf8_to_wstrbuf("\xe3\x81\xad\xe3\x81\x93", buffer); // "Neko" in hiragana.
|
|
REQUIRE(std::wstring(buffer.data(), buffer.size()) == std::wstring(L"\x306d\x3053"));
|
|
}
|
|
#endif
|
|
|
|
struct auto_closer {
|
|
FILE* fp = nullptr;
|
|
explicit auto_closer(FILE* f)
|
|
: fp(f) {}
|
|
auto_closer(const auto_closer&) = delete;
|
|
auto_closer& operator=(const auto_closer&) = delete;
|
|
~auto_closer() {
|
|
if (fp != nullptr) (void)std::fclose(fp);
|
|
}
|
|
};
|
|
|
|
TEST_CASE("os::fwrite_bytes", "[os]") {
|
|
using spdlog::details::os::create_dir;
|
|
using spdlog::details::os::fwrite_bytes;
|
|
const char* filename = "log_tests/test_fwrite_bytes.txt";
|
|
const char* msg = "hello";
|
|
prepare_logdir();
|
|
REQUIRE(create_dir("log_tests"));
|
|
{
|
|
auto_closer closer(std::fopen(filename, "wb"));
|
|
REQUIRE(closer.fp != nullptr);
|
|
REQUIRE(fwrite_bytes(msg, std::strlen(msg), closer.fp) == true);
|
|
REQUIRE(fwrite_bytes(msg, 0, closer.fp) == true);
|
|
std::fflush(closer.fp);
|
|
REQUIRE(spdlog::details::os::filesize(closer.fp) == 5);
|
|
}
|
|
// fwrite_bytes should return false on write failure
|
|
auto_closer closer(std::fopen(filename, "r"));
|
|
REQUIRE(closer.fp != nullptr);
|
|
REQUIRE_FALSE(fwrite_bytes("Hello", 5, closer.fp));
|
|
}
|