From 664fc0573550c248c5ed049836af8fefb0d0517e Mon Sep 17 00:00:00 2001 From: Odysseas Georgoudis Date: Sat, 5 Oct 2024 12:49:15 +0100 Subject: [PATCH] format all files --- .../include/quill_wrapper/quill_wrapper.cpp | 2 +- examples/backend_tsc_clock.cpp | 2 +- examples/file_logging.cpp | 2 +- .../include/quill_wrapper/quill_wrapper.cpp | 2 +- examples/rotating_file_logging.cpp | 2 +- examples/shared_library/example_shared.cpp | 4 +- .../quill_wrapper_shared.cpp | 2 +- examples/signal_handler.cpp | 2 +- .../RotatingFileSinkWithFormatter.h | 11 ++-- examples/user_defined_filter.cpp | 2 +- examples/user_defined_types_logging.cpp | 2 +- include/quill/CsvWriter.h | 6 +- include/quill/LogMacros.h | 66 +++++++++---------- include/quill/StringRef.h | 8 +-- include/quill/backend/BackendOptions.h | 4 +- include/quill/backend/TransitEvent.h | 2 +- include/quill/core/LoggerBase.h | 4 +- include/quill/core/SinkManager.h | 2 +- include/quill/core/ThreadContextManager.h | 8 +-- include/quill/sinks/FileSink.h | 2 +- include/quill/sinks/NullSink.h | 3 +- include/quill/sinks/RotatingFileSink.h | 3 +- include/quill/sinks/StreamSink.h | 2 +- include/quill/std/Deque.h | 2 +- include/quill/std/FilesystemPath.h | 2 +- include/quill/std/ForwardList.h | 2 +- include/quill/std/List.h | 2 +- include/quill/std/Map.h | 2 +- include/quill/std/Optional.h | 2 +- include/quill/std/Pair.h | 2 +- include/quill/std/Set.h | 2 +- include/quill/std/Tuple.h | 2 +- include/quill/std/UnorderedMap.h | 2 +- include/quill/std/UnorderedSet.h | 7 +- include/quill/std/Vector.h | 2 +- .../BackendExceptionNotifierTest.cpp | 2 +- .../ConsoleSinkStderrMultipleFormatsTest.cpp | 3 +- .../ConsoleSinkStdoutMultipleFormatsTest.cpp | 3 +- .../JsonVariedParamsLoggingTest.cpp | 9 +-- .../integration_tests/StdArrayLoggingTest.cpp | 2 +- .../StdVectorLoggingTest.cpp | 2 +- .../integration_tests/UserClockSourceTest.cpp | 6 +- .../UserDefinedTypeLoggingTest.cpp | 2 +- test/unit_tests/DynamicFormatArgStoreTest.cpp | 4 +- test/unit_tests/LogLevelTest.cpp | 24 +++---- test/unit_tests/LoggerTest.cpp | 4 +- 46 files changed, 118 insertions(+), 115 deletions(-) diff --git a/examples/advanced/quill_wrapper/include/quill_wrapper/quill_wrapper.cpp b/examples/advanced/quill_wrapper/include/quill_wrapper/quill_wrapper.cpp index 1fe08c44..b37569d0 100644 --- a/examples/advanced/quill_wrapper/include/quill_wrapper/quill_wrapper.cpp +++ b/examples/advanced/quill_wrapper/include/quill_wrapper/quill_wrapper.cpp @@ -17,6 +17,6 @@ void setup_quill(char const* log_file) quill::Frontend::create_or_get_logger( "root", std::move(console_sink), quill::PatternFormatterOptions{"%(time) [%(thread_id)] %(short_source_location:<28) " - "LOG_%(log_level:<9) %(logger:<12) %(message)", + "LOG_%(log_level:<9) %(logger:<12) %(message)", "%H:%M:%S.%Qns", quill::Timezone::GmtTime}); } \ No newline at end of file diff --git a/examples/backend_tsc_clock.cpp b/examples/backend_tsc_clock.cpp index e9b8827c..5cff4d42 100644 --- a/examples/backend_tsc_clock.cpp +++ b/examples/backend_tsc_clock.cpp @@ -52,7 +52,7 @@ int main() auto const tsc_start_seconds = std::chrono::duration_cast( quill::BackendTscClock::to_time_point(tsc_start).time_since_epoch()) .count(); - + auto const tsc_end_seconds = std::chrono::duration_cast( quill::BackendTscClock::to_time_point(tsc_end).time_since_epoch()) .count(); diff --git a/examples/file_logging.cpp b/examples/file_logging.cpp index 8545be02..4f1dcd0c 100644 --- a/examples/file_logging.cpp +++ b/examples/file_logging.cpp @@ -47,7 +47,7 @@ int main() quill::Logger* logger = quill::Frontend::create_or_get_logger( "root", std::move(file_sink), quill::PatternFormatterOptions{"%(time) [%(thread_id)] %(short_source_location:<28) " - "LOG_%(log_level:<9) %(logger:<12) %(message)", + "LOG_%(log_level:<9) %(logger:<12) %(message)", "%H:%M:%S.%Qns", quill::Timezone::GmtTime}); // set the log level of the logger to debug (default is info) diff --git a/examples/recommended_usage/quill_wrapper/include/quill_wrapper/quill_wrapper.cpp b/examples/recommended_usage/quill_wrapper/include/quill_wrapper/quill_wrapper.cpp index de8e9f21..8200b5de 100644 --- a/examples/recommended_usage/quill_wrapper/include/quill_wrapper/quill_wrapper.cpp +++ b/examples/recommended_usage/quill_wrapper/include/quill_wrapper/quill_wrapper.cpp @@ -30,6 +30,6 @@ void setup_quill(char const* log_file) global_logger_a = quill::Frontend::create_or_get_logger( "root", std::move(file_sink), quill::PatternFormatterOptions{"%(time) [%(thread_id)] %(short_source_location:<28) " - "LOG_%(log_level:<9) %(logger:<12) %(message)", + "LOG_%(log_level:<9) %(logger:<12) %(message)", "%H:%M:%S.%Qns", quill::Timezone::GmtTime}); } \ No newline at end of file diff --git a/examples/rotating_file_logging.cpp b/examples/rotating_file_logging.cpp index 4fcbfbec..22707d28 100644 --- a/examples/rotating_file_logging.cpp +++ b/examples/rotating_file_logging.cpp @@ -34,7 +34,7 @@ int main() quill::Logger* logger = quill::Frontend::create_or_get_logger( "root", std::move(rotating_file_sink), quill::PatternFormatterOptions{"%(time) [%(thread_id)] %(short_source_location:<28) " - "LOG_%(log_level:<9) %(logger:<12) %(message)", + "LOG_%(log_level:<9) %(logger:<12) %(message)", "%H:%M:%S.%Qns", quill::Timezone::GmtTime}); for (int i = 0; i < 20; ++i) diff --git a/examples/shared_library/example_shared.cpp b/examples/shared_library/example_shared.cpp index bcca7c41..4b4cf4b6 100644 --- a/examples/shared_library/example_shared.cpp +++ b/examples/shared_library/example_shared.cpp @@ -24,8 +24,8 @@ int main() // Change the LogLevel to print everything global_logger_a->set_log_level(quill::LogLevel::TraceL3); - std::string s {"string"}; - std::string_view sv {"string_view"}; + std::string s{"string"}; + std::string_view sv{"string_view"}; LOG_TRACE_L3(global_logger_a, "This is a log trace l3 example {}", 1); LOG_TRACE_L2(global_logger_a, "This is a log trace l2 example {} {}", 2, 2.3); diff --git a/examples/shared_library/quill_wrapper_shared/include/quill_wrapper_shared/quill_wrapper_shared.cpp b/examples/shared_library/quill_wrapper_shared/include/quill_wrapper_shared/quill_wrapper_shared.cpp index 9030a8d5..e84816f4 100644 --- a/examples/shared_library/quill_wrapper_shared/include/quill_wrapper_shared/quill_wrapper_shared.cpp +++ b/examples/shared_library/quill_wrapper_shared/include/quill_wrapper_shared/quill_wrapper_shared.cpp @@ -20,6 +20,6 @@ void setup_quill() global_logger_a = quill::Frontend::create_or_get_logger( "root", std::move(console_sink), quill::PatternFormatterOptions{"%(time) [%(thread_id)] %(short_source_location:<28) " - "LOG_%(log_level:<9) %(logger:<12) %(message)", + "LOG_%(log_level:<9) %(logger:<12) %(message)", "%H:%M:%S.%Qns", quill::Timezone::GmtTime}); } \ No newline at end of file diff --git a/examples/signal_handler.cpp b/examples/signal_handler.cpp index 17688e84..7b282e21 100644 --- a/examples/signal_handler.cpp +++ b/examples/signal_handler.cpp @@ -76,7 +76,7 @@ int main() } // After 10 messages Crash - Uncomment any of the below : - + // illegal_instruction(logger); // cause_segfault(logger); }); diff --git a/examples/single_logger_multiple_sink_formats/RotatingFileSinkWithFormatter.h b/examples/single_logger_multiple_sink_formats/RotatingFileSinkWithFormatter.h index 81d52498..cc3ce640 100644 --- a/examples/single_logger_multiple_sink_formats/RotatingFileSinkWithFormatter.h +++ b/examples/single_logger_multiple_sink_formats/RotatingFileSinkWithFormatter.h @@ -19,18 +19,19 @@ class RotatingFileSinkWithFormatter : public quill::RotatingFileSink { } - void write_log(quill::MacroMetadata const* log_metadata, uint64_t log_timestamp, std::string_view thread_id, - std::string_view thread_name, std::string const& process_id, - std::string_view logger_name, quill::LogLevel log_level, + void write_log(quill::MacroMetadata const* log_metadata, uint64_t log_timestamp, + std::string_view thread_id, std::string_view thread_name, + std::string const& process_id, std::string_view logger_name, quill::LogLevel log_level, std::string_view log_level_description, std::string_view log_level_short_code, std::vector> const* named_args, - std::string_view log_message, std::string_view) override + std::string_view log_message, std::string_view) override { std::string_view const formatted_log_statement = _formatter.format(log_timestamp, thread_id, thread_name, process_id, logger_name, log_level_description, log_level_short_code, *log_metadata, named_args, log_message); - quill::RotatingFileSink::write_log(log_metadata, log_timestamp, thread_id, thread_name, process_id, logger_name, log_level, + quill::RotatingFileSink::write_log( + log_metadata, log_timestamp, thread_id, thread_name, process_id, logger_name, log_level, log_level_description, log_level_short_code, named_args, log_message, formatted_log_statement); } diff --git a/examples/user_defined_filter.cpp b/examples/user_defined_filter.cpp index 5b44686b..7fd374b0 100644 --- a/examples/user_defined_filter.cpp +++ b/examples/user_defined_filter.cpp @@ -19,7 +19,7 @@ class UserFilter : public quill::Filter { public: - UserFilter() : quill::Filter("filter_1"){}; + UserFilter() : quill::Filter("filter_1") {}; bool filter(quill::MacroMetadata const* /** log_metadata **/, uint64_t /** log_timestamp **/, std::string_view /** thread_id **/, std::string_view /** thread_name **/, diff --git a/examples/user_defined_types_logging.cpp b/examples/user_defined_types_logging.cpp index 8e450c96..013033b5 100644 --- a/examples/user_defined_types_logging.cpp +++ b/examples/user_defined_types_logging.cpp @@ -25,7 +25,7 @@ class User { public: User(std::string name, std::string surname, uint32_t age) - : name(std::move(name)), surname(std::move(surname)), age(age){}; + : name(std::move(name)), surname(std::move(surname)), age(age) {}; friend std::ostream& operator<<(std::ostream& os, User const& obj) { diff --git a/include/quill/CsvWriter.h b/include/quill/CsvWriter.h index c7c1c411..dbc6d3e7 100644 --- a/include/quill/CsvWriter.h +++ b/include/quill/CsvWriter.h @@ -88,8 +88,8 @@ class CsvWriter */ CsvWriter(std::string const& unique_name, std::initializer_list> sinks) { - _logger = Frontend::create_or_get_logger( - _logger_name_prefix + unique_name, sinks, PatternFormatterOptions{"%(message)", "", Timezone::GmtTime}); + _logger = Frontend::create_or_get_logger(_logger_name_prefix + unique_name, sinks, + PatternFormatterOptions{"%(message)", "", Timezone::GmtTime}); _logger->template log_statement(LogLevel::None, &_header_metadata, TCsvSchema::header); } @@ -127,7 +127,7 @@ class CsvWriter static constexpr MacroMetadata _line_metadata{ "", "", TCsvSchema::format, nullptr, LogLevel::Info, MacroMetadata::Event::Log}; - static inline std::string _logger_name_prefix {"__csv__"}; + static inline std::string _logger_name_prefix{"__csv__"}; LoggerImpl* _logger{nullptr}; }; diff --git a/include/quill/LogMacros.h b/include/quill/LogMacros.h index da4f9cc9..fa1a0ab9 100644 --- a/include/quill/LogMacros.h +++ b/include/quill/LogMacros.h @@ -302,15 +302,15 @@ quill::MacroMetadata::Event::Log \ } -#define QUILL_LOGGER_CALL(likelyhood, logger, tags, log_level, fmt, ...) \ - do \ - { \ - if (likelyhood(logger->template should_log_statement())) \ - { \ +#define QUILL_LOGGER_CALL(likelyhood, logger, tags, log_level, fmt, ...) \ + do \ + { \ + if (likelyhood(logger->template should_log_statement())) \ + { \ QUILL_DEFINE_MACRO_METADATA(__FUNCTION__, fmt, tags, log_level); \ logger->template log_statement( \ quill::LogLevel::None, ¯o_metadata, ##__VA_ARGS__); \ - } \ + } \ } while (0) #define QUILL_LOGGER_CALL_LIMIT(min_interval, likelyhood, logger, tags, log_level, fmt, ...) \ @@ -331,29 +331,29 @@ } \ } while (0) -#define QUILL_BACKTRACE_LOGGER_CALL(logger, tags, fmt, ...) \ - do \ - { \ - if (QUILL_LIKELY(logger->template should_log_statement())) \ - { \ +#define QUILL_BACKTRACE_LOGGER_CALL(logger, tags, fmt, ...) \ + do \ + { \ + if (QUILL_LIKELY(logger->template should_log_statement())) \ + { \ QUILL_DEFINE_MACRO_METADATA(__FUNCTION__, fmt, tags, quill::LogLevel::Backtrace); \ logger->template log_statement( \ quill::LogLevel::None, ¯o_metadata, ##__VA_ARGS__); \ - } \ + } \ } while (0) /** * Dynamic runtime log level with a tiny overhead * @Note: Prefer using the compile time log level macros */ -#define QUILL_DYNAMIC_LOGGER_CALL(logger, tags, log_level, fmt, ...) \ - do \ - { \ - if (logger->should_log_statement(log_level)) \ - { \ +#define QUILL_DYNAMIC_LOGGER_CALL(logger, tags, log_level, fmt, ...) \ + do \ + { \ + if (logger->should_log_statement(log_level)) \ + { \ QUILL_DEFINE_MACRO_METADATA(__FUNCTION__, fmt, tags, quill::LogLevel::Dynamic); \ logger->template log_statement(log_level, ¯o_metadata, ##__VA_ARGS__); \ - } \ + } \ } while (0) #if QUILL_COMPILE_ACTIVE_LOG_LEVEL <= QUILL_COMPILE_ACTIVE_LOG_LEVEL_TRACE_L3 @@ -585,37 +585,37 @@ #endif #if QUILL_COMPILE_ACTIVE_LOG_LEVEL <= QUILL_COMPILE_ACTIVE_LOG_LEVEL_NOTICE - #define QUILL_LOG_NOTICE(logger, fmt, ...) \ + #define QUILL_LOG_NOTICE(logger, fmt, ...) \ QUILL_LOGGER_CALL(QUILL_LIKELY, logger, nullptr, quill::LogLevel::Notice, fmt, ##__VA_ARGS__) - #define QUILL_LOG_NOTICE_LIMIT(min_interval, logger, fmt, ...) \ + #define QUILL_LOG_NOTICE_LIMIT(min_interval, logger, fmt, ...) \ QUILL_LOGGER_CALL_LIMIT(min_interval, QUILL_LIKELY, logger, nullptr, quill::LogLevel::Notice, fmt, ##__VA_ARGS__) - #define QUILL_LOG_NOTICE_TAGS(logger, tags, fmt, ...) \ + #define QUILL_LOG_NOTICE_TAGS(logger, tags, fmt, ...) \ QUILL_LOGGER_CALL(QUILL_LIKELY, logger, tags, quill::LogLevel::Notice, fmt, ##__VA_ARGS__) - #define QUILL_LOGV_NOTICE(logger, fmt, ...) \ - QUILL_LOGGER_CALL(QUILL_LIKELY, logger, nullptr, quill::LogLevel::Notice, \ + #define QUILL_LOGV_NOTICE(logger, fmt, ...) \ + QUILL_LOGGER_CALL(QUILL_LIKELY, logger, nullptr, quill::LogLevel::Notice, \ QUILL_GENERATE_FORMAT_STRING(fmt, ##__VA_ARGS__), ##__VA_ARGS__) - #define QUILL_LOGV_NOTICE_LIMIT(min_interval, logger, fmt, ...) \ - QUILL_LOGGER_CALL_LIMIT(min_interval, QUILL_LIKELY, logger, nullptr, quill::LogLevel::Notice, \ + #define QUILL_LOGV_NOTICE_LIMIT(min_interval, logger, fmt, ...) \ + QUILL_LOGGER_CALL_LIMIT(min_interval, QUILL_LIKELY, logger, nullptr, quill::LogLevel::Notice, \ QUILL_GENERATE_FORMAT_STRING(fmt, ##__VA_ARGS__), ##__VA_ARGS__) - #define QUILL_LOGV_NOTICE_TAGS(logger, tags, fmt, ...) \ - QUILL_LOGGER_CALL(QUILL_LIKELY, logger, tags, quill::LogLevel::Notice, \ + #define QUILL_LOGV_NOTICE_TAGS(logger, tags, fmt, ...) \ + QUILL_LOGGER_CALL(QUILL_LIKELY, logger, tags, quill::LogLevel::Notice, \ QUILL_GENERATE_FORMAT_STRING(fmt, ##__VA_ARGS__), ##__VA_ARGS__) - #define QUILL_LOGJ_NOTICE(logger, fmt, ...) \ - QUILL_LOGGER_CALL(QUILL_LIKELY, logger, nullptr, quill::LogLevel::Notice, \ + #define QUILL_LOGJ_NOTICE(logger, fmt, ...) \ + QUILL_LOGGER_CALL(QUILL_LIKELY, logger, nullptr, quill::LogLevel::Notice, \ QUILL_GENERATE_NAMED_FORMAT_STRING(fmt, ##__VA_ARGS__), ##__VA_ARGS__) - #define QUILL_LOGJ_NOTICE_LIMIT(min_interval, logger, fmt, ...) \ - QUILL_LOGGER_CALL_LIMIT(min_interval, QUILL_LIKELY, logger, nullptr, quill::LogLevel::Notice, \ + #define QUILL_LOGJ_NOTICE_LIMIT(min_interval, logger, fmt, ...) \ + QUILL_LOGGER_CALL_LIMIT(min_interval, QUILL_LIKELY, logger, nullptr, quill::LogLevel::Notice, \ QUILL_GENERATE_NAMED_FORMAT_STRING(fmt, ##__VA_ARGS__), ##__VA_ARGS__) - #define QUILL_LOGJ_NOTICE_TAGS(logger, tags, fmt, ...) \ - QUILL_LOGGER_CALL(QUILL_LIKELY, logger, tags, quill::LogLevel::Notice, \ + #define QUILL_LOGJ_NOTICE_TAGS(logger, tags, fmt, ...) \ + QUILL_LOGGER_CALL(QUILL_LIKELY, logger, tags, quill::LogLevel::Notice, \ QUILL_GENERATE_NAMED_FORMAT_STRING(fmt, ##__VA_ARGS__), ##__VA_ARGS__) #else #define QUILL_LOG_NOTICE(logger, fmt, ...) (void)0 diff --git a/include/quill/StringRef.h b/include/quill/StringRef.h index 35cad248..c280421a 100644 --- a/include/quill/StringRef.h +++ b/include/quill/StringRef.h @@ -32,10 +32,10 @@ namespace utility class StringRef { public: - explicit StringRef(std::string const& str) : _str_view(str){}; - explicit StringRef(std::string_view str) : _str_view(str){}; - explicit StringRef(char const* str) : _str_view(str, strlen(str)){}; - StringRef(char const* str, size_t size) : _str_view(str, size){}; + explicit StringRef(std::string const& str) : _str_view(str) {}; + explicit StringRef(std::string_view str) : _str_view(str) {}; + explicit StringRef(char const* str) : _str_view(str, strlen(str)) {}; + StringRef(char const* str, size_t size) : _str_view(str, size) {}; QUILL_NODISCARD std::string_view const& get_string_view() const noexcept { return _str_view; } diff --git a/include/quill/backend/BackendOptions.h b/include/quill/backend/BackendOptions.h index 6e330a28..cc23ca7d 100644 --- a/include/quill/backend/BackendOptions.h +++ b/include/quill/backend/BackendOptions.h @@ -205,8 +205,8 @@ struct BackendOptions * These names provide human-readable identifiers for each log level. */ std::array log_level_descriptions = { - "TRACE_L3", "TRACE_L2", "TRACE_L1", "DEBUG", "INFO", "NOTICE", "WARNING", - "ERROR", "CRITICAL", "BACKTRACE", "NONE", "DYNAMIC"}; + "TRACE_L3", "TRACE_L2", "TRACE_L1", "DEBUG", "INFO", "NOTICE", + "WARNING", "ERROR", "CRITICAL", "BACKTRACE", "NONE", "DYNAMIC"}; /** * @brief Short codes or identifiers for each log level. diff --git a/include/quill/backend/TransitEvent.h b/include/quill/backend/TransitEvent.h index bbe3923d..f66b3d58 100644 --- a/include/quill/backend/TransitEvent.h +++ b/include/quill/backend/TransitEvent.h @@ -32,7 +32,7 @@ class LoggerBase; struct TransitEvent { using FormatBuffer = fmtquill::basic_memory_buffer; - + /***/ TransitEvent() = default; diff --git a/include/quill/core/LoggerBase.h b/include/quill/core/LoggerBase.h index ccce6620..c841f5d7 100644 --- a/include/quill/core/LoggerBase.h +++ b/include/quill/core/LoggerBase.h @@ -72,9 +72,7 @@ class LoggerBase * Returns the user-defined clock source. * @return A pointer to the constant UserClockSource object. */ - QUILL_NODISCARD UserClockSource* get_user_clock_source() const noexcept { - return user_clock; - } + QUILL_NODISCARD UserClockSource* get_user_clock_source() const noexcept { return user_clock; } /** * Returns the type of clock source being used. diff --git a/include/quill/core/SinkManager.h b/include/quill/core/SinkManager.h index 87704c38..a1e1ee37 100644 --- a/include/quill/core/SinkManager.h +++ b/include/quill/core/SinkManager.h @@ -32,7 +32,7 @@ class SinkManager { explicit SinkInfo() = default; SinkInfo(std::string sid, std::weak_ptr sptr) - : sink_id(static_cast(sid)), sink_ptr(static_cast&&>(sptr)){}; + : sink_id(static_cast(sid)), sink_ptr(static_cast&&>(sptr)) {}; std::string sink_id; std::weak_ptr sink_ptr; diff --git a/include/quill/core/ThreadContextManager.h b/include/quill/core/ThreadContextManager.h index b6e05c54..0c36e954 100644 --- a/include/quill/core/ThreadContextManager.h +++ b/include/quill/core/ThreadContextManager.h @@ -174,9 +174,7 @@ class ThreadContext void mark_invalid() noexcept { _valid.store(false, std::memory_order_relaxed); } /***/ - QUILL_NODISCARD bool is_valid() const noexcept { - return _valid.load(std::memory_order_relaxed); - } + QUILL_NODISCARD bool is_valid() const noexcept { return _valid.load(std::memory_order_relaxed); } /***/ void increment_failure_counter() noexcept @@ -199,8 +197,8 @@ class ThreadContext SpscQueueUnion _spsc_queue_union; /**< queue for this thread */ SizeCacheVector _conditional_arg_size_cache; /**< cache for storing sizes needed for specific operations, such as when calling `strn` functions or when a loop is required e.g. caching the size of a type */ - std::string _thread_id = std::to_string(get_thread_id()); /**< cached thread pid */ - std::string _thread_name = get_thread_name(); /**< cached thread name */ + std::string _thread_id = std::to_string(get_thread_id()); /**< cached thread pid */ + std::string _thread_name = get_thread_name(); /**< cached thread name */ std::shared_ptr _transit_event_buffer; /**< backend thread buffer. this could be unique_ptr but it is shared_ptr because of the forward declaration */ QueueType _queue_type; std::atomic _valid{true}; /**< is this context valid, set by the frontend, read by the backend thread */ diff --git a/include/quill/sinks/FileSink.h b/include/quill/sinks/FileSink.h index 1d358621..79e4a6b0 100644 --- a/include/quill/sinks/FileSink.h +++ b/include/quill/sinks/FileSink.h @@ -124,7 +124,7 @@ class FileSinkConfig * @param value True to perform fsync, false otherwise. */ QUILL_ATTRIBUTE_COLD void set_fsync_enabled(bool value) { _fsync_enabled = value; } - + /** * @brief Sets the open mode for the file. * Valid options for the open mode are 'a' or 'w'. The default value is 'a'. diff --git a/include/quill/sinks/NullSink.h b/include/quill/sinks/NullSink.h index f2ed3af5..505ad6cd 100644 --- a/include/quill/sinks/NullSink.h +++ b/include/quill/sinks/NullSink.h @@ -26,7 +26,8 @@ class NullSink : public Sink public: QUILL_ATTRIBUTE_HOT void write_log(MacroMetadata const* log_metadata, uint64_t log_timestamp, std::string_view thread_id, std::string_view thread_name, - std::string const& process_id, std::string_view logger_name, LogLevel log_level, std::string_view log_level_description, + std::string const& process_id, std::string_view logger_name, + LogLevel log_level, std::string_view log_level_description, std::string_view log_level_short_code, std::vector> const* named_args, std::string_view log_message, std::string_view log_statement) override diff --git a/include/quill/sinks/RotatingFileSink.h b/include/quill/sinks/RotatingFileSink.h index bfd1e864..b268575b 100644 --- a/include/quill/sinks/RotatingFileSink.h +++ b/include/quill/sinks/RotatingFileSink.h @@ -309,7 +309,8 @@ class RotatingFileSink : public FileSink */ QUILL_ATTRIBUTE_HOT void write_log(MacroMetadata const* log_metadata, uint64_t log_timestamp, std::string_view thread_id, std::string_view thread_name, - std::string const& process_id, std::string_view logger_name, LogLevel log_level, std::string_view log_level_description, + std::string const& process_id, std::string_view logger_name, + LogLevel log_level, std::string_view log_level_description, std::string_view log_level_short_code, std::vector> const* named_args, std::string_view log_message, std::string_view log_statement) override diff --git a/include/quill/sinks/StreamSink.h b/include/quill/sinks/StreamSink.h index ef314023..664011c8 100644 --- a/include/quill/sinks/StreamSink.h +++ b/include/quill/sinks/StreamSink.h @@ -126,7 +126,7 @@ class StreamSink : public Sink */ QUILL_ATTRIBUTE_HOT void write_log(MacroMetadata const* /* log_metadata */, uint64_t /* log_timestamp */, std::string_view /* thread_id */, - std::string_view /* thread_name */, std::string const& /* process_id */, + std::string_view /* thread_name */, std::string const& /* process_id */, std::string_view /* logger_name */, LogLevel /* log_level */, std::string_view /* log_level_description */, std::string_view /* log_level_short_code */, diff --git a/include/quill/std/Deque.h b/include/quill/std/Deque.h index 9b01ac40..6d05493e 100644 --- a/include/quill/std/Deque.h +++ b/include/quill/std/Deque.h @@ -12,8 +12,8 @@ #include "quill/core/InlinedVector.h" #include "quill/core/Utf8Conv.h" -#include "quill/bundled/fmt/ranges.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/ranges.h" #include #include diff --git a/include/quill/std/FilesystemPath.h b/include/quill/std/FilesystemPath.h index 566611be..cf9fea42 100644 --- a/include/quill/std/FilesystemPath.h +++ b/include/quill/std/FilesystemPath.h @@ -12,8 +12,8 @@ #include "quill/core/Filesystem.h" #include "quill/core/InlinedVector.h" -#include "quill/bundled/fmt/std.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/std.h" #include #include diff --git a/include/quill/std/ForwardList.h b/include/quill/std/ForwardList.h index 40f02926..25aa25af 100644 --- a/include/quill/std/ForwardList.h +++ b/include/quill/std/ForwardList.h @@ -12,8 +12,8 @@ #include "quill/core/InlinedVector.h" #include "quill/core/Utf8Conv.h" -#include "quill/bundled/fmt/ranges.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/ranges.h" #include #include diff --git a/include/quill/std/List.h b/include/quill/std/List.h index 2b28509f..b2776aa2 100644 --- a/include/quill/std/List.h +++ b/include/quill/std/List.h @@ -12,8 +12,8 @@ #include "quill/core/InlinedVector.h" #include "quill/core/Utf8Conv.h" -#include "quill/bundled/fmt/ranges.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/ranges.h" #include #include diff --git a/include/quill/std/Map.h b/include/quill/std/Map.h index 70281bf4..3e84ac72 100644 --- a/include/quill/std/Map.h +++ b/include/quill/std/Map.h @@ -13,8 +13,8 @@ #include "quill/core/Utf8Conv.h" #include "quill/std/Pair.h" -#include "quill/bundled/fmt/ranges.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/ranges.h" #include #include diff --git a/include/quill/std/Optional.h b/include/quill/std/Optional.h index 18c2da44..335e7f58 100644 --- a/include/quill/std/Optional.h +++ b/include/quill/std/Optional.h @@ -12,8 +12,8 @@ #include "quill/core/InlinedVector.h" #include "quill/core/Utf8Conv.h" -#include "quill/bundled/fmt/std.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/std.h" #include #include diff --git a/include/quill/std/Pair.h b/include/quill/std/Pair.h index 9c22f74f..aa642175 100644 --- a/include/quill/std/Pair.h +++ b/include/quill/std/Pair.h @@ -12,8 +12,8 @@ #include "quill/core/InlinedVector.h" #include "quill/core/Utf8Conv.h" -#include "quill/bundled/fmt/ranges.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/ranges.h" #include #include diff --git a/include/quill/std/Set.h b/include/quill/std/Set.h index 23a285ba..89b684e4 100644 --- a/include/quill/std/Set.h +++ b/include/quill/std/Set.h @@ -12,8 +12,8 @@ #include "quill/core/InlinedVector.h" #include "quill/core/Utf8Conv.h" -#include "quill/bundled/fmt/ranges.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/ranges.h" #include #include diff --git a/include/quill/std/Tuple.h b/include/quill/std/Tuple.h index 27f2ca62..a71b6d25 100644 --- a/include/quill/std/Tuple.h +++ b/include/quill/std/Tuple.h @@ -11,8 +11,8 @@ #include "quill/core/DynamicFormatArgStore.h" #include "quill/core/InlinedVector.h" -#include "quill/bundled/fmt/ranges.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/ranges.h" #include #include diff --git a/include/quill/std/UnorderedMap.h b/include/quill/std/UnorderedMap.h index f3e1d0db..989db9d3 100644 --- a/include/quill/std/UnorderedMap.h +++ b/include/quill/std/UnorderedMap.h @@ -13,8 +13,8 @@ #include "quill/core/Utf8Conv.h" #include "quill/std/Pair.h" -#include "quill/bundled/fmt/ranges.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/ranges.h" #include #include diff --git a/include/quill/std/UnorderedSet.h b/include/quill/std/UnorderedSet.h index 6e1192c3..28ea6134 100644 --- a/include/quill/std/UnorderedSet.h +++ b/include/quill/std/UnorderedSet.h @@ -12,8 +12,8 @@ #include "quill/core/InlinedVector.h" #include "quill/core/Utf8Conv.h" -#include "quill/bundled/fmt/ranges.h" #include "quill/bundled/fmt/format.h" +#include "quill/bundled/fmt/ranges.h" #include #include @@ -25,8 +25,9 @@ QUILL_BEGIN_NAMESPACE template