danny
/
spdlog
mirror of https://github.com/gabime/spdlog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clang format

Browse Source
pull/3028/head
gabime 2 years ago
parent 5654205d6b
commit e28eadcd52
38 changed files with 336 additions and 366 deletions
Show Stats Download Patch File Download Diff File

7
CMakeLists.txt
Unescape Escape View File

@ -145,12 +145,7 @@ message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
# ---------------------------------------------------------------------------------------
# Static/Shared library
# ---------------------------------------------------------------------------------------
file(GLOB SPDLOG_SRCS
src/*.cpp
src/details/*.cpp
src/sinks/*.cpp
src/cfg/*.cpp
)
file(GLOB SPDLOG_SRCS src/*.cpp src/details/*.cpp src/sinks/*.cpp src/cfg/*.cpp)
if(NOT SPDLOG_USE_STD_FORMAT AND NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
list(APPEND SPDLOG_SRCS src/fmt/bundled_fmtlib_format.cpp)

1
include/spdlog/async_logger.h
Unescape Escape View File

@ -63,4 +63,3 @@ private:
async_overflow_policy overflow_policy_;
};
} // namespace spdlog

14
include/spdlog/common.h
Unescape Escape View File

@ -37,7 +37,6 @@
# endif
#endif
#if defined(SPDLOG_SHARED_LIB)
# if defined(_WIN32)
# ifdef spdlog_EXPORTS
@ -134,7 +133,6 @@ using wmemory_buf_t = fmt::basic_memory_buffer<wchar_t, 250>;
# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x)
#endif // SPDLOG_USE_STD_FORMAT
#define SPDLOG_LEVEL_TRACE 0
#define SPDLOG_LEVEL_DEBUG 1
#define SPDLOG_LEVEL_INFO 2
@ -171,11 +169,17 @@ enum class level
#endif
#if !defined(SPDLOG_LEVEL_NAMES)
#define SPDLOG_LEVEL_NAMES { "trace", "debug", "info", "warning", "error", "critical", "off"}
# define SPDLOG_LEVEL_NAMES \
{ \
"trace", "debug", "info", "warning", "error", "critical", "off" \
}
#endif
#if !defined(SPDLOG_SHORT_LEVEL_NAMES)
#define SPDLOG_SHORT_LEVEL_NAMES {"T", "D", "I", "W", "E", "C", "O"}
# define SPDLOG_SHORT_LEVEL_NAMES \
{ \
"T", "D", "I", "W", "E", "C", "O" \
}
#endif
[[nodiscard]] constexpr size_t level_to_number(level lvl) noexcept
@ -198,8 +202,6 @@ constexpr std::array<const char *, levels_count> short_level_names SPDLOG_SHORT_
SPDLOG_API [[nodiscard]] spdlog::level level_from_str(const std::string &name) noexcept;
//
// Color mode used by sinks with color support.
//

1
include/spdlog/details/log_msg.h
Unescape Escape View File

@ -31,4 +31,3 @@ struct SPDLOG_API log_msg
};
} // namespace details
} // namespace spdlog

1
include/spdlog/details/log_msg_buffer.h
Unescape Escape View File

@ -27,4 +27,3 @@ public:
} // namespace details
} // namespace spdlog

1
include/spdlog/details/os.h
Unescape Escape View File

@ -116,4 +116,3 @@ SPDLOG_API bool fsync(FILE *fp);
} // namespace os
} // namespace details
} // namespace spdlog

1
include/spdlog/pattern_formatter.h
Unescape Escape View File

@ -122,4 +122,3 @@ private:
void compile_pattern_(const std::string &pattern);
};
} // namespace spdlog

1
include/spdlog/sinks/base_sink.h
Unescape Escape View File

@ -46,4 +46,3 @@ protected:
};
} // namespace sinks
} // namespace spdlog

1
include/spdlog/sinks/basic_file_sink.h
Unescape Escape View File

@ -54,4 +54,3 @@ inline std::shared_ptr<logger> basic_logger_st(
}
} // namespace spdlog

4
include/spdlog/sinks/daily_file_sink.h
Unescape Escape View File

@ -33,8 +33,8 @@ struct daily_filename_calculator
{
filename_t basename, ext;
std::tie(basename, ext) = details::file_helper::split_by_extension(filename);
return fmt_lib::format(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}{}"), basename, now_tm.tm_year + 1900,
now_tm.tm_mon + 1, now_tm.tm_mday, ext);
return fmt_lib::format(
SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}{}"), basename, now_tm.tm_year + 1900, now_tm.tm_mon + 1, now_tm.tm_mday, ext);
}
};

7
include/spdlog/sinks/mongo_sink.h
Unescape Escape View File

@ -66,9 +66,10 @@ protected:
if (client_ != nullptr)
{
auto doc = document{} << "timestamp" << bsoncxx::types::b_date(msg.time) << "level" << level::to_string_view(msg.log_level).data()
<< "level_num" << msg.log_level << "message" << std::string(msg.payload.begin(), msg.payload.end())
<< "logger_name" << std::string(msg.logger_name.begin(), msg.logger_name.end()) << "thread_id"
auto doc = document{} << "timestamp" << bsoncxx::types::b_date(msg.time) << "level"
<< level::to_string_view(msg.log_level).data() << "level_num" << msg.log_level << "message"
<< std::string(msg.payload.begin(), msg.payload.end()) << "logger_name"
<< std::string(msg.logger_name.begin(), msg.logger_name.end()) << "thread_id"
<< static_cast<int>(msg.thread_id) << finalize;
client_->database(db_name_).collection(coll_name_).insert_one(doc.view());
}

1
include/spdlog/sinks/sink.h
Unescape Escape View File

@ -29,4 +29,3 @@ protected:
} // namespace sinks
} // namespace spdlog

1
include/spdlog/sinks/stdout_sinks.h
Unescape Escape View File

@ -81,4 +81,3 @@ template<typename Factory = spdlog::synchronous_factory>
std::shared_ptr<logger> stderr_logger_st(const std::string &logger_name);
} // namespace spdlog

1
src/cfg/.helpers.cpp
Unescape Escape View File

@ -1,7 +1,6 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#include <spdlog/cfg/helpers.h>
#include <spdlog/spdlog.h>
#include <spdlog/details/registry.h>

7
src/details/log_msg.cpp
Unescape Escape View File

@ -7,8 +7,8 @@
namespace spdlog {
namespace details {
log_msg::log_msg(spdlog::log_clock::time_point log_time, spdlog::source_loc loc, string_view_t a_logger_name,
spdlog::level lvl, spdlog::string_view_t msg)
log_msg::log_msg(spdlog::log_clock::time_point log_time, spdlog::source_loc loc, string_view_t a_logger_name, spdlog::level lvl,
spdlog::string_view_t msg)
: logger_name(a_logger_name)
, log_level(lvl)
, time(log_time)
@ -19,8 +19,7 @@ namespace details {
, payload(msg)
{}
log_msg::log_msg(
spdlog::source_loc loc, string_view_t a_logger_name, spdlog::level lvl, spdlog::string_view_t msg)
log_msg::log_msg(spdlog::source_loc loc, string_view_t a_logger_name, spdlog::level lvl, spdlog::string_view_t msg)
: log_msg(os::now(), loc, a_logger_name, lvl, msg)
{}

3
src/details/thread_pool.cpp
Unescape Escape View File

@ -8,8 +8,7 @@
namespace spdlog {
namespace details {
thread_pool::thread_pool(
size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start, std::function<void()> on_thread_stop)
thread_pool::thread_pool(size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start, std::function<void()> on_thread_stop)
: q_(q_max_items)
{
if (threads_n == 0 || threads_n > 1000)

3
src/pattern_formatter.cpp
Unescape Escape View File

@ -1009,8 +1009,7 @@ private:
} // namespace details
pattern_formatter::pattern_formatter(
std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags)
pattern_formatter::pattern_formatter(std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags)
: pattern_(std::move(pattern))
, eol_(std::move(eol))
, pattern_time_type_(time_type)

2
src/sinks/ansicolor_sink.cpp
Unescape Escape View File

@ -1,13 +1,11 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#include <spdlog/sinks/ansicolor_sink.h>
#include <spdlog/pattern_formatter.h>
#include <spdlog/details/os.h>
namespace spdlog {
namespace sinks {

2
src/sinks/base_sink.cpp
Unescape Escape View File

@ -1,8 +1,6 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#include <spdlog/sinks/base_sink.h>
#include <spdlog/common.h>
#include <spdlog/pattern_formatter.h>

4
src/sinks/sink.cpp
Unescape Escape View File

@ -1,7 +1,6 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#include <spdlog/sinks/sink.h>
#include <spdlog/common.h>
@ -16,6 +15,7 @@
level_.store(level, std::memory_order_relaxed);
}
spdlog::level spdlog::sinks::sink::log_level() const {
spdlog::level spdlog::sinks::sink::log_level() const
{
return static_cast<spdlog::level>(level_.load(std::memory_order_relaxed));
}

14
src/sinks/stdout_color_sinks.cpp
Unescape Escape View File

@ -10,22 +10,26 @@
namespace spdlog {
template<typename Factory>
std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name, color_mode mode) {
std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name, color_mode mode)
{
return Factory::template create<sinks::stdout_color_sink_mt>(logger_name, mode);
}
template<typename Factory>
std::shared_ptr<logger> stdout_color_st(const std::string &logger_name, color_mode mode) {
std::shared_ptr<logger> stdout_color_st(const std::string &logger_name, color_mode mode)
{
return Factory::template create<sinks::stdout_color_sink_st>(logger_name, mode);
}
template<typename Factory>
std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name, color_mode mode) {
std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name, color_mode mode)
{
return Factory::template create<sinks::stderr_color_sink_mt>(logger_name, mode);
}
template<typename Factory>
std::shared_ptr<logger> stderr_color_st(const std::string &logger_name, color_mode mode) {
std::shared_ptr<logger> stderr_color_st(const std::string &logger_name, color_mode mode)
{
return Factory::template create<sinks::stderr_color_sink_st>(logger_name, mode);
}
} // namespace spdlog
@ -54,5 +58,3 @@ template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stderr_color_mt<spdl
template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stderr_color_st<spdlog::async_factory>(
const std::string &logger_name, color_mode mode);

2
src/sinks/stdout_sinks.cpp
Unescape Escape View File

@ -153,5 +153,3 @@ template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stdout_logger_mt<spd
template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stdout_logger_st<spdlog::async_factory>(const std::string &logger_name);
template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stderr_logger_mt<spdlog::async_factory>(const std::string &logger_name);
template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spdlog::async_factory>(const std::string &logger_name);

1
src/sinks/wincolor_sink.cpp
Unescape Escape View File

@ -173,7 +173,6 @@ template<typename ConsoleMutex>
} // namespace sinks
} // namespace spdlog
// template instantiations
template SPDLOG_API class spdlog::sinks::wincolor_stdout_sink<spdlog::details::console_mutex>;
template SPDLOG_API class spdlog::sinks::wincolor_stdout_sink<spdlog::details::console_nullmutex>;

4
tests/CMakeLists.txt
Unescape Escape View File

@ -47,8 +47,7 @@ set(SPDLOG_UTESTS_SOURCES
test_circular_q.cpp
test_ringbuffer_sink.cpp
test_source_location.cpp
test_log_level.cpp
)
test_log_level.cpp)
if(NOT SPDLOG_NO_EXCEPTIONS)
list(APPEND SPDLOG_UTESTS_SOURCES test_errors.cpp)
@ -82,4 +81,3 @@ endfunction()
if(SPDLOG_BUILD_TESTS OR SPDLOG_BUILD_ALL)
spdlog_prepare_test(spdlog-utests spdlog::spdlog)
endif()

14
tests/test_log_level.cpp
Unescape Escape View File

@ -8,11 +8,10 @@ TEST_CASE("test_default_level", "[log_level]")
auto test_sink = std::make_shared<spdlog::sinks::test_sink_st>();
REQUIRE(test_sink->log_level() == spdlog::level::trace);
spdlog::logger logger("test-level", test_sink);
REQUIRE(test_sink->log_level() == spdlog::level::trace);\
REQUIRE(test_sink->log_level() == spdlog::level::trace);
REQUIRE(logger.log_level() == spdlog::level::info);
}
// test that logger log only messages with level bigger or equal to its level
void test_logger_level(spdlog::level level);
TEST_CASE("test_logger_levels", "[log_level]")
@ -24,7 +23,6 @@ TEST_CASE("test_logger_levels", "[log_level]")
}
}
// test that logger log all messages with level bigger or equal to its level
void test_sink_level(spdlog::level level);
TEST_CASE("test_sink_levels", "[log_level]")
@ -36,7 +34,6 @@ TEST_CASE("test_sink_levels", "[log_level]")
}
}
//
// test helpers to check that logger/sink displays only messages with level bigger or equal to its level
//
@ -47,12 +44,8 @@ auto get_expected_messages(spdlog::level level)
{spdlog::level::trace, {"trace hello", "debug hello", "info hello", "warning hello", "error hello", "critical hello"}},
{spdlog::level::debug, {"debug hello", "info hello", "warning hello", "error hello", "critical hello"}},
{spdlog::level::info, {"info hello", "warning hello", "error hello", "critical hello"}},
{spdlog::level::warn, {"warning hello", "error hello", "critical hello"}},
{spdlog::level::err, {"error hello", "critical hello"}},
{spdlog::level::critical, {"critical hello"}},
{spdlog::level::off, {}},
{spdlog::level::n_levels, {}}
};
{spdlog::level::warn, {"warning hello", "error hello", "critical hello"}}, {spdlog::level::err, {"error hello", "critical hello"}},
{spdlog::level::critical, {"critical hello"}}, {spdlog::level::off, {}}, {spdlog::level::n_levels, {}}};
return messages.at(level);
}
@ -76,7 +69,6 @@ void test_logger_level(spdlog::level level)
REQUIRE(lines == get_expected_messages(level));
}
// test that sink displays all messages with level bigger or equal to its level
void test_sink_level(spdlog::level level)
{

Write Preview
Loading…
Cancel
Save