tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 05:34:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7210 from Icinga/bugfix/boost-asio-deprecated

Browse Source 
Quality: Replace deprecated get_io_service() with get_executor().context() for Boost ASIO
This commit is contained in:
Michael Friedrich 2019-05-29 15:40:19 +02:00 committed by GitHub
commit 438da67209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/tcpsocket.hpp
View File

@ -37,7 +37,7 @@ void Connect(Socket& socket, const String& node, const String& service)
{ {
using boost::asio::ip::tcp; using boost::asio::ip::tcp;
tcp::resolver resolver (socket.get_io_service()); tcp::resolver resolver (socket.get_executor().context());
tcp::resolver::query query (node, service); tcp::resolver::query query (node, service);
auto result (resolver.resolve(query)); auto result (resolver.resolve(query));
auto current (result.begin()); auto current (result.begin());
@ -66,7 +66,7 @@ void Connect(Socket& socket, const String& node, const String& service, boost::a
{ {
using boost::asio::ip::tcp; using boost::asio::ip::tcp;
tcp::resolver resolver (socket.get_io_service()); tcp::resolver resolver (socket.get_executor().context());
tcp::resolver::query query (node, service); tcp::resolver::query query (node, service);
auto result (resolver.async_resolve(query, yc)); auto result (resolver.async_resolve(query, yc));
auto current (result.begin()); auto current (result.begin());

4
lib/remote/apilistener.cpp
View File

@ -417,7 +417,7 @@ void ApiListener::ListenerCoroutineProc(boost::asio::yield_context yc, const std
{ {
namespace asio = boost::asio; namespace asio = boost::asio;
auto& io (server->get_io_service()); auto& io (server->get_executor().context());
for (;;) { for (;;) {
try { try {
@ -641,7 +641,7 @@ void ApiListener::NewClientHandlerInternal(boost::asio::yield_context yc, const
endpoint->AddClient(aclient); endpoint->AddClient(aclient);
asio::spawn(client->get_io_service(), [this, aclient, endpoint, needSync](asio::yield_context yc) { asio::spawn(client->get_executor().context(), [this, aclient, endpoint, needSync](asio::yield_context yc) {
CpuBoundWork syncClient (yc); CpuBoundWork syncClient (yc);
SyncClient(aclient, endpoint, needSync); SyncClient(aclient, endpoint, needSync);

4
lib/remote/httpserverconnection.cpp
View File

@ -31,7 +31,7 @@ using namespace icinga;
auto const l_ServerHeader ("Icinga/" + Application::GetAppVersion()); auto const l_ServerHeader ("Icinga/" + Application::GetAppVersion());
HttpServerConnection::HttpServerConnection(const String& identity, bool authenticated, const std::shared_ptr<AsioTlsStream>& stream) HttpServerConnection::HttpServerConnection(const String& identity, bool authenticated, const std::shared_ptr<AsioTlsStream>& stream)
: m_Stream(stream), m_Seen(Utility::GetTime()), m_IoStrand(stream->get_io_service()), m_ShuttingDown(false), m_HasStartedStreaming(false) : m_Stream(stream), m_Seen(Utility::GetTime()), m_IoStrand(stream->get_executor().context()), m_ShuttingDown(false), m_HasStartedStreaming(false)
{ {
if (authenticated) { if (authenticated) {
m_ApiUser = ApiUser::GetByClientCN(identity); m_ApiUser = ApiUser::GetByClientCN(identity);
@ -529,7 +529,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
void HttpServerConnection::CheckLiveness(boost::asio::yield_context yc) void HttpServerConnection::CheckLiveness(boost::asio::yield_context yc)
{ {
boost::asio::deadline_timer timer (m_Stream->get_io_service()); boost::asio::deadline_timer timer (m_Stream->get_executor().context());
for (;;) { for (;;) {
timer.expires_from_now(boost::posix_time::seconds(5)); timer.expires_from_now(boost::posix_time::seconds(5));

2
lib/remote/jsonrpcconnection-heartbeat.cpp
View File

@ -17,7 +17,7 @@ REGISTER_APIFUNCTION(Heartbeat, event, &JsonRpcConnection::HeartbeatAPIHandler);
void JsonRpcConnection::HandleAndWriteHeartbeats(boost::asio::yield_context yc) void JsonRpcConnection::HandleAndWriteHeartbeats(boost::asio::yield_context yc)
{ {
boost::asio::deadline_timer timer (m_Stream->get_io_service()); boost::asio::deadline_timer timer (m_Stream->get_executor().context());
for (;;) { for (;;) {
timer.expires_from_now(boost::posix_time::seconds(10)); timer.expires_from_now(boost::posix_time::seconds(10));

6
lib/remote/jsonrpcconnection.cpp
View File

@ -31,8 +31,8 @@ static RingBuffer l_TaskStats (15 * 60);
JsonRpcConnection::JsonRpcConnection(const String& identity, bool authenticated, JsonRpcConnection::JsonRpcConnection(const String& identity, bool authenticated,
const std::shared_ptr<AsioTlsStream>& stream, ConnectionRole role) const std::shared_ptr<AsioTlsStream>& stream, ConnectionRole role)
: m_Identity(identity), m_Authenticated(authenticated), m_Stream(stream), : m_Identity(identity), m_Authenticated(authenticated), m_Stream(stream),
m_Role(role), m_Timestamp(Utility::GetTime()), m_Seen(Utility::GetTime()), m_NextHeartbeat(0), m_IoStrand(stream->get_io_service()), m_Role(role), m_Timestamp(Utility::GetTime()), m_Seen(Utility::GetTime()), m_NextHeartbeat(0), m_IoStrand(stream->get_executor().context()),
m_OutgoingMessagesQueued(stream->get_io_service()), m_WriterDone(stream->get_io_service()), m_ShuttingDown(false) m_OutgoingMessagesQueued(stream->get_executor().context()), m_WriterDone(stream->get_executor().context()), m_ShuttingDown(false)
{ {
if (authenticated) if (authenticated)
m_Endpoint = Endpoint::GetByName(identity); m_Endpoint = Endpoint::GetByName(identity);
@ -310,7 +310,7 @@ Value SetLogPositionHandler(const MessageOrigin::Ptr& origin, const Dictionary::
void JsonRpcConnection::CheckLiveness(boost::asio::yield_context yc) void JsonRpcConnection::CheckLiveness(boost::asio::yield_context yc)
{ {
boost::asio::deadline_timer timer (m_Stream->get_io_service()); boost::asio::deadline_timer timer (m_Stream->get_executor().context());
for (;;) { for (;;) {
timer.expires_from_now(boost::posix_time::seconds(30)); timer.expires_from_now(boost::posix_time::seconds(30));