diff options
author | Shauren <shauren.trinity@gmail.com> | 2018-01-06 12:28:38 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2018-01-06 12:30:28 +0100 |
commit | b2b4f9d1e4562ec246efb5136c1c674ec78f50b7 (patch) | |
tree | ba0d81ce1ba02528599030fde736f30c19d49d72 /src/common/Metric/Metric.cpp | |
parent | 6da6f1b415be2e7964c7c15c87b29a38052e76e4 (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
(cherry picked from commit dfd2660a85e4f0891c63009ee8425b2796586409)
Diffstat (limited to 'src/common/Metric/Metric.cpp')
-rw-r--r-- | src/common/Metric/Metric.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp index a35906b2a34..6b58f77f217 100644 --- a/src/common/Metric/Metric.cpp +++ b/src/common/Metric/Metric.cpp @@ -16,21 +16,21 @@ */ #include "Metric.h" -#include "AsioHacksImpl.h" #include "Common.h" #include "Config.h" #include "Log.h" +#include "Strand.h" #include "Util.h" #include <boost/algorithm/string/replace.hpp> #include <boost/asio/deadline_timer.hpp> #include <boost/asio/ip/tcp.hpp> -void Metric::Initialize(std::string const& realmName, boost::asio::io_service& ioService, std::function<void()> overallStatusLogger) +void Metric::Initialize(std::string const& realmName, Trinity::Asio::IoContext& ioContext, std::function<void()> overallStatusLogger) { _dataStream = Trinity::make_unique<boost::asio::ip::tcp::iostream>(); _realmName = FormatInfluxDBTagValue(realmName); - _batchTimer = Trinity::make_unique<boost::asio::deadline_timer>(ioService); - _overallStatusTimer = Trinity::make_unique<boost::asio::deadline_timer>(ioService); + _batchTimer = Trinity::make_unique<boost::asio::deadline_timer>(ioContext); + _overallStatusTimer = Trinity::make_unique<boost::asio::deadline_timer>(ioContext); _overallStatusLogger = overallStatusLogger; LoadFromConfigs(); } @@ -215,8 +215,8 @@ void Metric::ScheduleSend() void Metric::Unload() { - // Send what's queued only if io_service is stopped (so only on shutdown) - if (_enabled && _batchTimer->get_io_service().stopped()) + // Send what's queued only if IoContext is stopped (so only on shutdown) + if (_enabled && Trinity::Asio::get_io_context(*_batchTimer).stopped()) { _enabled = false; SendBatch(); |