import ceph quincy 17.2.4

[ceph.git] / ceph / src / crimson / os / seastore / logging.h

diff --git a/ceph/src/crimson/os/seastore/logging.h b/ceph/src/crimson/os/seastore/logging.h
index 7153850eca35483e20970daa7a118c30aca087c6..5094a6e4a5a6bc5f7d6bd38a0522f9e5919b6cae 100644 (file)
--- a/ceph/src/crimson/os/seastore/logging.h
+++ b/ceph/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, FNAME, (void*)&t , ##__VA_ARGS__)
 
-#else
-
-// do compile-time format string validation
-using namespace fmt::literals;
-template<seastar::log_level lv>
-void _LOG(seastar::logger& logger, std::string_view info) {
-  logger.log(lv, info.data());
-}
-
-#define LOG(level_, MSG, ...) \
-  _LOG<level_>(LOCAL_LOGGER, "{}: " MSG ## _format(FNAME , ##__VA_ARGS__))
-#define LOGT(level_, MSG, t_, ...) \
-  _LOG<level_>(LOCAL_LOGGER, "{}({}): " MSG ## _format(FNAME, (void*)&t_ , ##__VA_ARGS__))
-#define SUBLOG(subname_, level_, MSG, ...) \
-  _LOG<level_>(LOGGER(subname_), "{}: " MSG ## _format(FNAME , ##__VA_ARGS__))
-#define SUBLOGT(subname_, level_, MSG, t_, ...) \
-  _LOG<level_>(LOGGER(subname_), "{}({}): " MSG ## _format(FNAME, (void*)&t_ , ##__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__)