Skip to content

🎨 Expose logging::panic for use with custom log levels #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🎨 Expose logging::panic for use with custom log levels #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions include/log/log.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ template <stdx::ct_string Msg> constexpr auto cx_log_wrap(int, auto &&...args) {
#define CIB_ERROR(...) \
CIB_LOG_WITH_LEVEL(logging::level::ERROR __VA_OPT__(, ) __VA_ARGS__)

namespace logging::detail {
namespace logging {
template <stdx::ct_string Fmt, typename Env, typename F, typename L>
[[nodiscard]] constexpr auto panic(F file, L line, auto &&...args) {
STDX_PRAGMA(diagnostic push)
Expand All @@ -102,14 +102,12 @@ template <stdx::ct_string Fmt, typename Env, typename F, typename L>

constexpr auto N = stdx::num_fmt_specifiers<Fmt>;
constexpr auto sz = sizeof...(args);
using env_t =
stdx::extend_env_t<Env, logging::get_level, logging::level::FATAL>;

#if __cpp_pack_indexing >= 202311L
auto s = [&]<std::size_t... Is>(std::index_sequence<Is...>) {
return stdx::ct_format<Fmt>(FWD(args...[Is])...);
}(std::make_index_sequence<N>{});
logging::log<env_t>(file, line, s);
log<Env>(file, line, s);

[&]<std::size_t... Is>(std::index_sequence<Is...>) {
stdx::panic<decltype(s.str)::value>(std::move(s).args,
Expand All @@ -127,7 +125,7 @@ template <stdx::ct_string Fmt, typename Env, typename F, typename L>
auto s = stdx::get<0>(std::move(t)).apply([](auto &&...fmt_args) {
return stdx::ct_format<Fmt>(FWD(fmt_args)...);
});
logging::log<env_t>(file, line, s);
log<Env>(file, line, s);

stdx::get<1>(std::move(t)).apply([&](auto &&...extra_args) {
stdx::panic<decltype(s.str)::value>(std::move(s).args,
Expand All @@ -137,10 +135,11 @@ template <stdx::ct_string Fmt, typename Env, typename F, typename L>

STDX_PRAGMA(diagnostic pop)
}
} // namespace logging::detail
} // namespace logging

#define CIB_FATAL(MSG, ...) \
logging::detail::panic<MSG, cib_log_env_t>( \
logging::panic<MSG, stdx::extend_env_t<cib_log_env_t, logging::get_level, \
logging::level::FATAL>>( \
__FILE__, __LINE__ __VA_OPT__(, STDX_MAP(CX_WRAP, __VA_ARGS__)))

#define CIB_ASSERT(expr, ...) \
Expand Down
25 changes: 25 additions & 0 deletions test/log/log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,28 @@ TEST_CASE("CIB_ASSERT passes arguments to panic", "[log]") {
CHECK(buffer.find(expected_why) != std::string::npos);
CHECK(panicked);
}

namespace {
enum struct custom_level { THE_ONE_LEVEL = 5 };
}

namespace logging {
template <custom_level L>
[[nodiscard]] auto format_as(level_wrapper<L>) -> std::string_view {
STATIC_REQUIRE(L == custom_level::THE_ONE_LEVEL);
return "THE_ONE_LEVEL";
}
} // namespace logging

#define CUSTOM_FATAL(MSG, ...) \
logging::panic<MSG, stdx::extend_env_t<cib_log_env_t, logging::get_level, \
custom_level::THE_ONE_LEVEL>>( \
__FILE__, __LINE__ __VA_OPT__(, STDX_MAP(CX_WRAP, __VA_ARGS__)))

TEST_CASE("panic works with custom level", "[log]") {
reset_test_state();

CUSTOM_FATAL("Hello");
CAPTURE(buffer);
CHECK(buffer.find("THE_ONE_LEVEL") != std::string::npos);
}
Loading