aboutsummaryrefslogtreecommitdiff
path: root/src/common/Logging/Log.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2018-01-06 01:21:59 +0100
committerShauren <shauren.trinity@gmail.com>2018-01-06 01:21:59 +0100
commitdfd2660a85e4f0891c63009ee8425b2796586409 (patch)
tree26704dff3840402765ada5e6e4549a48b95ed82b /src/common/Logging/Log.cpp
parent76577ddc3ca4edd5943777443d9cf5a4c5314e10 (diff)
Core/Misc: Added compatibility layer for boost 1.66 and future std:: networking stuff
* Based on work done by @dimiandre in PR #21173 Closes #21171 Closes #21173
Diffstat (limited to 'src/common/Logging/Log.cpp')
-rw-r--r--src/common/Logging/Log.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
index de9caf08581..3ce0307a96b 100644
--- a/src/common/Logging/Log.cpp
+++ b/src/common/Logging/Log.cpp
@@ -19,18 +19,18 @@
#include "Log.h"
#include "AppenderConsole.h"
#include "AppenderFile.h"
-#include "AsioHacksImpl.h"
#include "Common.h"
#include "Config.h"
#include "Errors.h"
#include "Logger.h"
#include "LogMessage.h"
#include "LogOperation.h"
+#include "Strand.h"
#include "Util.h"
#include <chrono>
#include <sstream>
-Log::Log() : AppenderId(0), lowestLogLevel(LOG_LEVEL_FATAL), _ioService(nullptr), _strand(nullptr)
+Log::Log() : AppenderId(0), lowestLogLevel(LOG_LEVEL_FATAL), _ioContext(nullptr), _strand(nullptr)
{
m_logsTimestamp = "_" + GetTimestampStr();
RegisterAppender<AppenderConsole>();
@@ -228,11 +228,10 @@ void Log::write(std::unique_ptr<LogMessage>&& msg) const
{
Logger const* logger = GetLoggerByType(msg->type);
- if (_ioService)
+ if (_ioContext)
{
- auto logOperation = std::make_shared<LogOperation>(logger, std::move(msg));
-
- _ioService->post(_strand->wrap([logOperation](){ logOperation->call(); }));
+ 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(); }));
}
else
logger->write(msg.get());
@@ -367,12 +366,12 @@ Log* Log::instance()
return &instance;
}
-void Log::Initialize(boost::asio::io_service* ioService)
+void Log::Initialize(Trinity::Asio::IoContext* ioContext)
{
- if (ioService)
+ if (ioContext)
{
- _ioService = ioService;
- _strand = new Trinity::AsioStrand(*ioService);
+ _ioContext = ioContext;
+ _strand = new Trinity::Asio::Strand(*ioContext);
}
LoadFromConfig();
@@ -382,7 +381,7 @@ void Log::SetSynchronous()
{
delete _strand;
_strand = nullptr;
- _ioService = nullptr;
+ _ioContext = nullptr;
}
void Log::LoadFromConfig()