logger: use fmt8 appender and checked arguments helpers

Author: ironMann

src/common/SubTimeFrameFileSink.cxx

@@ -143,7 +143,7 @@ bool SubTimeFrameFileSink::makeDirectory()
 
   try {
     fmt::memory_buffer lDir;
-    fmt::format_to(lDir, "run{}_{}", ("0" + DataDistLogger::sRunNumberStr), FilePathUtils::getDataDirName(mRootDir));
+    fmt::format_to(fmt::appender(lDir), "run0{}_{}", DataDistLogger::sRunNumberStr, FilePathUtils::getDataDirName(mRootDir));
     mCurrentDir = (bfs::path(mRootDir) / bfs::path(lDir.begin(), lDir.end())).string();
 
     // make the run directory

src/common/SubTimeFrameFileWriter.cxx

@@ -82,8 +82,8 @@ namespace impl {
     const auto lHdrCnt = sizeof(sInfoData) / sizeof(SidecarInfoData);
 
     for (std::size_t i = 0; i < lHdrCnt; i++) {
-      fmt::format_to(std::back_inserter(lHeader), sInfoData[i].mHdrFmt, sInfoData[i].mHdr);
-      fmt::format_to(std::back_inserter(lHeader), "{}", (i < lHdrCnt - 1) ? " " : "");
+      fmt::format_to(fmt::appender(lHeader), sInfoData[i].mHdrFmt, sInfoData[i].mHdr);
+      fmt::format_to(fmt::appender(lHeader), "{}", (i < lHdrCnt - 1) ? " " : "");
     }
 
     return std::string(std::string(lHeader.begin(), lHeader.end()));
@@ -92,8 +92,8 @@ namespace impl {
   template<class T>
   static void sInfoVal(fmt::memory_buffer &pBuf, const SidecarInfoDataType pType, const T& pVal) {
     const auto lHdrCnt = sizeof(sInfoData) / sizeof(SidecarInfoData);
-    fmt::format_to(std::back_inserter(pBuf), sInfoData[pType].mValFmt, pVal);
-    fmt::format_to(std::back_inserter(pBuf), "{}", (pType < lHdrCnt - 1) ? " " : "");
+    fmt::format_to(fmt::appender(pBuf), sInfoData[pType].mValFmt, pVal);
+    fmt::format_to(fmt::appender(pBuf), "{}", (pType < lHdrCnt - 1) ? " " : "");
   }
 }
 

src/common/base/DataDistLogger.h

@@ -82,9 +82,9 @@ class DataDistLogger {
 
   inline void do_vformat(fmt::string_view format, fmt::format_args args) {
     try {
-      fmt::vformat_to(std::back_inserter(mLogMessage), format, args);
+      fmt::vformat_to(fmt::appender(mLogMessage), format, args);
     } catch (const fmt::format_error &e) {
-      fmt::format_to(std::back_inserter(mLogMessage), FMT_STRING("FORMAT ERROR: {}. provided_format_string={}"), e.what(), format);
+      fmt::format_to(fmt::appender(mLogMessage), "FORMAT ERROR: {}. provided_format_string={}", e.what(), format);
     }
   }
 
@@ -96,45 +96,23 @@ class DataDistLogger {
     sThisThreadName = strdup(sThrName.c_str());
   }
 
-  template<typename... Args>
-  DataDistLogger(const DataDistSeverity pSeverity, const log_fmt&, const char* format, const Args&... pArgs)
+  template<typename S, typename... Args>
+  DataDistLogger(const DataDistSeverity pSeverity, const log_fmt&, const S &format, Args&&... pArgs)
   : mSeverity(pSeverity) {
     fair::Logger::SetConsoleSeverity(fair::Severity::nolog);
 
     if (mSeverity <= DataDistSeverity::debug && sThisThreadName) {
-      fmt::format_to(std::back_inserter(mLogMessage), "<{}> ", sThisThreadName);
+      fmt::format_to(fmt::appender(mLogMessage), "<{:s}> ", sThisThreadName);
     }
 
-    do_vformat(format, fmt::make_format_args(pArgs...));
+    do_vformat(format, fmt::make_args_checked<Args...>(format, pArgs...));
   }
 
-  template<typename... Args>
-  DataDistLogger(const DataDistSeverity pSeverity, const log_fmt&, const std::string &format, const Args&... pArgs)
-  : DataDistLogger(pSeverity, log_fmt{}, format.c_str(), pArgs...)
-  {}
-
   template<typename... Args>
   DataDistLogger(const DataDistSeverity pSeverity, const log_fmq&, const std::string &pMsg)
   : DataDistLogger(pSeverity, log_fmt{}, "[FMQ] {}", pMsg)
   {}
 
-  template<class... Args>
-  DataDistLogger(const DataDistSeverity pSeverity, const Args&... pArgs)
-  : mSeverity(pSeverity) {
-    fair::Logger::SetConsoleSeverity(fair::Severity::nolog);
-
-    if (mSeverity <= DataDistSeverity::debug && sThisThreadName) {
-      fmt::format_to(std::back_inserter(mLogMessage), "<{}> ", sThisThreadName);
-    }
-
-    if constexpr (sizeof...(Args) > 0) {
-      static_assert(!std::is_same_v<typename std::tuple_element<0, std::tuple<Args...>>::type, log_fmt>,
-        "First parameter to DDLOGF must be format string (const char*).");
-
-      (fmt::format_to(std::back_inserter(mLogMessage), "{}", pArgs), ...);
-    }
-  }
-
   ~DataDistLogger() {
     try {
       switch(mSeverity) {
@@ -240,13 +218,13 @@ class DataDistLogger {
 
   template<typename T>
   DataDistLogger& operator<<(const T& pTObj) {
-    fmt::format_to(std::back_inserter(mLogMessage), "{}", pTObj);
+    fmt::format_to(fmt::appender(mLogMessage), "{}", pTObj);
     return *this;
   }
 
   DataDistLogger& operator<<(const char* cstr) {
     if (cstr != NULL) {
-        fmt::format_to(std::back_inserter(mLogMessage), cstr);
+        fmt::format_to(fmt::appender(mLogMessage), cstr);
     }
     return *this;
   }
@@ -428,8 +406,6 @@ struct DataDistLoggerCtx {
     }
   }
 
-
-
   // InfoLogger Options
   static boost::program_options::options_description getProgramOptions() {
     namespace bpo = boost::program_options;

src/common/monitoring/DataDistMonitoring.cxx

@@ -161,12 +161,12 @@ void DataDistMonitoring::MonitorThread()
         // log
         if (mLogMetric) {
           fmt::memory_buffer lLine;
-          fmt::format_to(std::back_inserter(lLine), "Metric={}", lMetric.getName());
+          fmt::format_to(fmt::appender(lLine), "Metric={}", lMetric.getName());
 
           for (const auto &lIter : lMetric.getValues()) {
             const std::string &lName = lIter.first;
             const auto lVal = std::get<double>(lIter.second);
-            fmt::format_to(std::back_inserter(lLine), " {}={:.3}", lName, lVal);
+            fmt::format_to(fmt::appender(lLine), " {}={:.3}", lName, lVal);
           }
 
           IDDLOG("{}", std::string(lLine.begin(), lLine.end()));