[Utils] Introduce CBatchedLogger

random-zebra · random-zebra · commit 90dd6ed27760 · 2022-02-15T17:46:25.000+01:00
&gt;&gt;&gt; inspired by dash@9d25bb1d8f0d3e5acc10549d9db8fa52f52be5b2
diff --git a/src/logging.cpp b/src/logging.cpp
@@ -124,6 +124,7 @@ const CLogCategoryDesc LogCategories[] = {
         {BCLog::VALIDATION,     "validation"},
         {BCLog::LLMQ,           "llmq"},
         {BCLog::NET_MN,         "net_mn"},
+        {BCLog::DKG,            "dkg"},
         {BCLog::ALL,            "1"},
         {BCLog::ALL,            "all"},
 };
@@ -260,3 +261,27 @@ void BCLog::Logger::ShrinkDebugFile()
     } else if (file != NULL)
         fclose(file);
 }
+
+/// PIVX
+
+CBatchedLogger::CBatchedLogger(BCLog::Logger* _logger, BCLog::LogFlags _category, const std::string& _header) :
+    logger(_logger),
+    accept(LogAcceptCategory(_category)),
+    header(_header)
+{}
+
+CBatchedLogger::~CBatchedLogger()
+{
+    Flush();
+}
+
+void CBatchedLogger::Flush()
+{
+    if (!accept || msg.empty()) {
+        return;
+    }
+    if (logger && logger->Enabled()) {
+        logger->LogPrintStr(strprintf("%s:\n%s", header, msg));
+    msg.clear();
+    }
+}
diff --git a/src/logging.h b/src/logging.h
@@ -1,15 +1,16 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2018 The Bitcoin developers
-// Copyright (c) 2015-2020 The PIVX developers
+// Copyright (c) 2018-2021 The Dash Core developers
+// Copyright (c) 2015-2022 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 /**
  * Server/client environment: argument handling, config file parsing,
  * logging, thread wrappers
  */
-#ifndef BITCOIN_LOGGING_H
-#define BITCOIN_LOGGING_H
+#ifndef PIVX_LOGGING_H
+#define PIVX_LOGGING_H
 
 #include "fs.h"
 #include "tinyformat.h"
@@ -64,6 +65,7 @@ namespace BCLog {
         VALIDATION  = (1 << 24),
         LLMQ        = (1 << 25),
         NET_MN      = (1 << 26),
+        DKG         = (1 << 27),
         ALL         = ~(uint32_t)0,
     };
 
@@ -163,4 +165,28 @@ static inline void LogPrintf(const char* fmt, const Args&... args)
     }                                                                               \
 } while(0)
 
-#endif // BITCOIN_LOGGING_H
+/// PIVX
+
+class CBatchedLogger
+{
+private:
+    BCLog::Logger* logger;
+    bool accept;
+    std::string header;
+    std::string msg;
+public:
+    CBatchedLogger(BCLog::Logger* _logger, BCLog::LogFlags _category, const std::string& _header);
+    virtual ~CBatchedLogger();
+    void Flush();
+
+    template<typename... Args>
+    void Batch(const std::string& fmt, const Args&... args)
+    {
+        if (!accept) {
+            return;
+        }
+        msg += "    " + strprintf(fmt, args...) + "\n";
+    }
+};
+
+#endif // PIVX_LOGGING_H
