diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index af1efcf46..6f831b359 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #ifdef _WIN32 @@ -275,22 +274,6 @@ Backend* GetBackend(const std::string& backend_name) { return Impl::Instance().GetBackend(backend_name); } -void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, - const char* function, const char* format, ...) { - auto filter = Impl::Instance().GetGlobalFilter(); - if (!filter.CheckMessage(log_class, log_level)) - return; - std::array formatting_buffer; - va_list args; - va_start(args, format); - vsnprintf(formatting_buffer.data(), formatting_buffer.size(), format, args); - va_end(args); - Entry entry = CreateEntry(log_class, log_level, filename, line_num, function, - std::string(formatting_buffer.data())); - - Impl::Instance().PushEntry(std::move(entry)); -} - void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, const char* format, const fmt::format_args& args) { diff --git a/src/common/logging/log.h b/src/common/logging/log.h index 83851e5ca..581a0de58 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -98,19 +98,6 @@ enum class Class : ClassType { Count ///< Total number of logging classes }; -/// Logs a message to the global logger. -void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, - const char* function, -#ifdef _MSC_VER - _Printf_format_string_ -#endif - const char* format, - ...) -#ifdef __GNUC__ - __attribute__((format(printf, 6, 7))) -#endif - ; - /// Logs a message to the global logger, using fmt void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, const char* format, @@ -125,27 +112,6 @@ void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsig } // namespace Log -#define LOG_GENERIC(log_class, log_level, ...) \ - ::Log::LogMessage(log_class, log_level, __FILE__, __LINE__, __func__, __VA_ARGS__) - -#ifdef _DEBUG -#define LOG_TRACE(log_class, ...) \ - LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Trace, __VA_ARGS__) -#else -#define LOG_TRACE(log_class, ...) (void(0)) -#endif - -#define LOG_DEBUG(log_class, ...) \ - LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Debug, __VA_ARGS__) -#define LOG_INFO(log_class, ...) \ - LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Info, __VA_ARGS__) -#define LOG_WARNING(log_class, ...) \ - LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Warning, __VA_ARGS__) -#define LOG_ERROR(log_class, ...) \ - LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Error, __VA_ARGS__) -#define LOG_CRITICAL(log_class, ...) \ - LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Critical, __VA_ARGS__) - // Define the fmt lib macros #define NGLOG_GENERIC(log_class, log_level, ...) \ ::Log::FmtLogMessage(log_class, log_level, __FILE__, __LINE__, __func__, __VA_ARGS__)