From b51afbdfb975b676cb885fc4f3559944f99df030 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 25 Aug 2023 10:40:47 +0200
Subject: Core/Logging: Fixed log message order not being preserved when async
 logging was enabled and ThreadPool was greater than 1

Despite that issue, logging was still threadsafe, just not ordered properly
---
 src/common/Asio/Strand.h     | 6 +++++-
 src/common/Logging/Log.cpp   | 2 +-
 src/common/Metric/Metric.cpp | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/common/Asio/Strand.h b/src/common/Asio/Strand.h
index 5beef144c60..942ddf55cd4 100644
--- a/src/common/Asio/Strand.h
+++ b/src/common/Asio/Strand.h
@@ -35,7 +35,11 @@ namespace Trinity
             Strand(IoContext& ioContext) : boost::asio::io_context::strand(ioContext) { }
         };
 
-        using boost::asio::bind_executor;
+        template<typename T>
+        inline decltype(auto) post(boost::asio::io_context::strand& strand, T&& t)
+        {
+            return boost::asio::post(strand, std::forward<T>(t));
+        }
     }
 }
 
diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
index c61ebb2bf85..75ea4fae380 100644
--- a/src/common/Logging/Log.cpp
+++ b/src/common/Logging/Log.cpp
@@ -238,7 +238,7 @@ void Log::write(std::unique_ptr<LogMessage> msg) const
     if (_ioContext)
     {
         std::shared_ptr<LogOperation> logOperation = std::make_shared<LogOperation>(logger, std::move(msg));
-        Trinity::Asio::post(*_ioContext, Trinity::Asio::bind_executor(*_strand, [logOperation]() { logOperation->call(); }));
+        Trinity::Asio::post(*_strand, [logOperation]() { logOperation->call(); });
     }
     else
         logger->write(msg.get());
diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp
index 7cd4f56fba5..0dc8e11ae80 100644
--- a/src/common/Metric/Metric.cpp
+++ b/src/common/Metric/Metric.cpp
@@ -18,8 +18,8 @@
 #include "Metric.h"
 #include "Config.h"
 #include "DeadlineTimer.h"
+#include "IoContext.h"
 #include "Log.h"
-#include "Strand.h"
 #include "Util.h"
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/asio/ip/tcp.hpp>
-- 
cgit v1.2.3