diff --git a/src/crimson/os/seastore/logging.h b/src/crimson/os/seastore/logging.h index 3f1f93439ef58..a5df4c9797568 100644 --- a/src/crimson/os/seastore/logging.h +++ b/src/crimson/os/seastore/logging.h @@ -12,8 +12,6 @@ #define LOGGER(subname_) crimson::get_logger(ceph_subsys_##subname_) #define LOG_PREFIX(x) constexpr auto FNAME = #x -#ifdef NDEBUG - #define LOG(level_, MSG, ...) \ LOCAL_LOGGER.log(level_, "{}: " MSG, FNAME , ##__VA_ARGS__) #define LOGT(level_, MSG, t, ...) \ @@ -23,26 +21,6 @@ #define SUBLOGT(subname_, level_, MSG, t, ...) \ LOGGER(subname_).log(level_, "{} {}: " MSG, (void*)&t, FNAME , ##__VA_ARGS__) -#else - -// do compile-time format string validation -using namespace fmt::literals; -template -void _LOG(seastar::logger& logger, std::string_view info) { - logger.log(lv, info.data()); -} - -#define LOG(level_, MSG, ...) \ - _LOG(LOCAL_LOGGER, "{}: " MSG ## _format(FNAME , ##__VA_ARGS__)) -#define LOGT(level_, MSG, t_, ...) \ - _LOG(LOCAL_LOGGER, "{} {}: " MSG ## _format((void*)&t_, FNAME , ##__VA_ARGS__)) -#define SUBLOG(subname_, level_, MSG, ...) \ - _LOG(LOGGER(subname_), "{}: " MSG ## _format(FNAME , ##__VA_ARGS__)) -#define SUBLOGT(subname_, level_, MSG, t_, ...) \ - _LOG(LOGGER(subname_), "{} {}: " MSG ## _format((void*)&t_, FNAME , ##__VA_ARGS__)) - -#endif - #define TRACE(...) LOG(seastar::log_level::trace, __VA_ARGS__) #define TRACET(...) LOGT(seastar::log_level::trace, __VA_ARGS__) #define SUBTRACE(subname_, ...) SUBLOG(subname_, seastar::log_level::trace, __VA_ARGS__)