2018-05-22 21:59:27 +03:00
|
|
|
//
|
|
|
|
|
// Copyright(c) 2018 Gabi Melman.
|
|
|
|
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
#pragma once
|
|
|
|
|
|
2018-05-27 02:53:16 +03:00
|
|
|
#include <chrono>
|
2025-01-17 20:59:46 +02:00
|
|
|
#include <exception>
|
Synchronize v2.x With Changes from v1.x (#3581)
* 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 v1 09a674b7)
- 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 v1 b656d1ce)
- 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 (v1 45b67eee); 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 for d5af52d9 in 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: PORTED ad725d34 getenv, 677a2d93 stopwatch, 3f7e5028, a6215527;
SUPERSEDED a45c9390, 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: 847db337 PORTED; 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; SUPERSEDED e3f5a4fe e655dbb6; N/A ae1de0dc 548b2642
- Counts 29/28/116/72; merge-report + commits-ported
Made-with: Cursor
* parity: qt_sinks sign casts (#3487); triage 9c582574 superseded
- 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
- SUPERSEDED 10320184 (ScopedPadder / %D already in v2)
- Triage 31/30/68; merge-report + commits-ported
Made-with: Cursor
* triage: supersede 5931a3d6 ba508057 47b7e7c7 (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: PORTED 1774e700 309204d5 f2a9dec0 472945ba; N/A d299603e 57505989;
SUPERSEDED 1ef8d3ce 8cfd4a7e; fix ba508057 row
Made-with: Cursor
* parity: udp_sink const udp_sink_config& (#3520); triage fc7e9c87 1685e694
- 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); triage 2670f47d d276069a 951c5b99
- 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); triage a2b42620 f355b3d5 d276069a
- 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: b7e0e2c2 71925ca3 fa6605dc 885b5473 96c9a62b 1e6250e1 d7155530
Made-with: Cursor
* parity: test_sink/callback iterator cast (#3315); triage Catch2 #3038
- difference_type cast for formatted.end() - eol_len (ad0f31c0)
- SUPERSEDED: c1569a3d Catch2 v3.5.0, 73e2e02b wstr_to_utf8buf bounds
Made-with: Cursor
* parity: SPDLOG_WCHAR_CONSOLE WriteConsoleW path (#3092); triage b6da5944
- 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: fe79bfcc 6725584e async tests 16e0d2e7 63d18842 d8e0ad46 1e7d7e07 3c23c27d
- SUPERSEDED: faa0a7a9 85bdab0c 276ee5f5 7f8060d5 96a8f625
- 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 — add 9fe79692 to ports table; fix 6004e3d1 paths
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>
2026-04-08 16:17:37 +02:00
|
|
|
#include <iterator>
|
2018-05-22 21:59:27 +03:00
|
|
|
#include <mutex>
|
2018-05-27 02:53:16 +03:00
|
|
|
#include <thread>
|
2018-05-22 21:59:27 +03:00
|
|
|
|
2023-09-29 00:20:26 +03:00
|
|
|
#include "spdlog/details/null_mutex.h"
|
2024-11-29 13:40:40 +02:00
|
|
|
#include "spdlog/details/os.h"
|
2023-09-29 00:20:26 +03:00
|
|
|
#include "spdlog/sinks/base_sink.h"
|
|
|
|
|
|
2018-05-22 21:59:27 +03:00
|
|
|
namespace spdlog {
|
|
|
|
|
namespace sinks {
|
|
|
|
|
|
2023-09-25 16:05:07 +03:00
|
|
|
template <class Mutex>
|
|
|
|
|
class test_sink : public base_sink<Mutex> {
|
2019-08-27 20:22:07 +03:00
|
|
|
const size_t lines_to_save = 100;
|
|
|
|
|
|
2018-05-22 21:59:27 +03:00
|
|
|
public:
|
2023-09-25 16:05:07 +03:00
|
|
|
size_t msg_counter() {
|
2018-08-14 00:58:50 +03:00
|
|
|
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
|
2018-05-22 21:59:27 +03:00
|
|
|
return msg_counter_;
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-25 16:05:07 +03:00
|
|
|
size_t flush_counter() {
|
2018-08-14 00:58:50 +03:00
|
|
|
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
|
2018-05-27 02:53:16 +03:00
|
|
|
return flush_counter_;
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-25 16:05:07 +03:00
|
|
|
void set_delay(std::chrono::milliseconds delay) {
|
2019-08-27 20:22:07 +03:00
|
|
|
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
|
2018-05-27 02:53:16 +03:00
|
|
|
delay_ = delay;
|
2018-05-22 21:59:27 +03:00
|
|
|
}
|
|
|
|
|
|
2025-01-17 20:59:46 +02:00
|
|
|
void set_exception(const std::runtime_error& ex) { exception_ptr_ = std::make_exception_ptr(ex); }
|
2025-01-05 02:17:31 +02:00
|
|
|
|
2025-01-17 20:59:46 +02:00
|
|
|
void clear_exception() { exception_ptr_ = nullptr; }
|
2025-01-05 02:17:31 +02:00
|
|
|
|
2019-08-27 20:22:07 +03:00
|
|
|
// return last output without the eol
|
2023-09-25 16:05:07 +03:00
|
|
|
std::vector<std::string> lines() {
|
2019-08-27 20:22:07 +03:00
|
|
|
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
|
|
|
|
|
return lines_;
|
|
|
|
|
}
|
2019-08-27 17:18:09 +03:00
|
|
|
|
2018-05-22 21:59:27 +03:00
|
|
|
protected:
|
2025-01-17 20:59:46 +02:00
|
|
|
void sink_it_(const details::log_msg& msg) override {
|
2025-01-05 02:17:31 +02:00
|
|
|
if (exception_ptr_) {
|
|
|
|
|
std::rethrow_exception(exception_ptr_);
|
|
|
|
|
}
|
2019-08-28 18:46:09 +03:00
|
|
|
memory_buf_t formatted;
|
2019-08-27 20:22:07 +03:00
|
|
|
base_sink<Mutex>::formatter_->format(msg, formatted);
|
|
|
|
|
// save the line without the eol
|
|
|
|
|
auto eol_len = strlen(details::os::default_eol);
|
2023-09-25 16:05:07 +03:00
|
|
|
if (lines_.size() < lines_to_save) {
|
Synchronize v2.x With Changes from v1.x (#3581)
* 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 v1 09a674b7)
- 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 v1 b656d1ce)
- 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 (v1 45b67eee); 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 for d5af52d9 in 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: PORTED ad725d34 getenv, 677a2d93 stopwatch, 3f7e5028, a6215527;
SUPERSEDED a45c9390, 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: 847db337 PORTED; 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; SUPERSEDED e3f5a4fe e655dbb6; N/A ae1de0dc 548b2642
- Counts 29/28/116/72; merge-report + commits-ported
Made-with: Cursor
* parity: qt_sinks sign casts (#3487); triage 9c582574 superseded
- 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
- SUPERSEDED 10320184 (ScopedPadder / %D already in v2)
- Triage 31/30/68; merge-report + commits-ported
Made-with: Cursor
* triage: supersede 5931a3d6 ba508057 47b7e7c7 (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: PORTED 1774e700 309204d5 f2a9dec0 472945ba; N/A d299603e 57505989;
SUPERSEDED 1ef8d3ce 8cfd4a7e; fix ba508057 row
Made-with: Cursor
* parity: udp_sink const udp_sink_config& (#3520); triage fc7e9c87 1685e694
- 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); triage 2670f47d d276069a 951c5b99
- 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); triage a2b42620 f355b3d5 d276069a
- 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: b7e0e2c2 71925ca3 fa6605dc 885b5473 96c9a62b 1e6250e1 d7155530
Made-with: Cursor
* parity: test_sink/callback iterator cast (#3315); triage Catch2 #3038
- difference_type cast for formatted.end() - eol_len (ad0f31c0)
- SUPERSEDED: c1569a3d Catch2 v3.5.0, 73e2e02b wstr_to_utf8buf bounds
Made-with: Cursor
* parity: SPDLOG_WCHAR_CONSOLE WriteConsoleW path (#3092); triage b6da5944
- 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: fe79bfcc 6725584e async tests 16e0d2e7 63d18842 d8e0ad46 1e7d7e07 3c23c27d
- SUPERSEDED: faa0a7a9 85bdab0c 276ee5f5 7f8060d5 96a8f625
- 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 — add 9fe79692 to ports table; fix 6004e3d1 paths
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>
2026-04-08 16:17:37 +02:00
|
|
|
using diff_t = typename std::iterator_traits<decltype(formatted.end())>::difference_type;
|
|
|
|
|
lines_.emplace_back(formatted.begin(), formatted.end() - static_cast<diff_t>(eol_len));
|
2019-08-27 20:22:07 +03:00
|
|
|
}
|
|
|
|
|
msg_counter_++;
|
|
|
|
|
std::this_thread::sleep_for(delay_);
|
2018-05-22 21:59:27 +03:00
|
|
|
}
|
|
|
|
|
|
2025-01-05 02:17:31 +02:00
|
|
|
void flush_() override {
|
|
|
|
|
if (exception_ptr_) {
|
|
|
|
|
std::rethrow_exception(exception_ptr_);
|
|
|
|
|
}
|
|
|
|
|
flush_counter_++;
|
|
|
|
|
}
|
2019-08-27 20:22:07 +03:00
|
|
|
|
2018-05-22 21:59:27 +03:00
|
|
|
size_t msg_counter_{0};
|
2018-05-27 02:53:16 +03:00
|
|
|
size_t flush_counter_{0};
|
2018-07-23 00:13:24 +03:00
|
|
|
std::chrono::milliseconds delay_{std::chrono::milliseconds::zero()};
|
2019-08-27 20:22:07 +03:00
|
|
|
std::vector<std::string> lines_;
|
2025-01-17 20:59:46 +02:00
|
|
|
std::exception_ptr exception_ptr_; // will be thrown on next log or flush if not null
|
2018-05-22 21:59:27 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
using test_sink_mt = test_sink<std::mutex>;
|
|
|
|
|
using test_sink_st = test_sink<details::null_mutex>;
|
|
|
|
|
|
2023-09-25 16:40:05 +03:00
|
|
|
} // namespace sinks
|
|
|
|
|
} // namespace spdlog
|