tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace std::shared_ptr<AsioTcpStream> with Shared<AsioTcpStream>::Ptr

Browse Source
This commit is contained in:
Alexander A. Klimov 2019-07-25 14:55:22 +02:00 committed by Michael Friedrich
parent a1683568a1
commit 26ce2cfb73
8 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/tlsstream.hpp
View File

@ -86,7 +86,7 @@ private:
}; };
typedef boost::asio::buffered_stream<boost::asio::ip::tcp::socket> AsioTcpStream; typedef boost::asio::buffered_stream<boost::asio::ip::tcp::socket> AsioTcpStream;
typedef std::pair<Shared<AsioTlsStream>::Ptr, std::shared_ptr<AsioTcpStream>> OptionalTlsStream; typedef std::pair<Shared<AsioTlsStream>::Ptr, Shared<AsioTcpStream>::Ptr> OptionalTlsStream;
} }

2
lib/perfdata/elasticsearchwriter.cpp
View File

@ -601,7 +601,7 @@ OptionalTlsStream ElasticsearchWriter::Connect()
stream.first = Shared<AsioTlsStream>::Make(IoEngine::Get().GetIoContext(), *sslContext, GetHost()); stream.first = Shared<AsioTlsStream>::Make(IoEngine::Get().GetIoContext(), *sslContext, GetHost());
} else { } else {
stream.second = std::make_shared<AsioTcpStream>(IoEngine::Get().GetIoContext()); stream.second = Shared<AsioTcpStream>::Make(IoEngine::Get().GetIoContext());
} }
try { try {

2
lib/perfdata/gelfwriter.cpp
View File

@ -176,7 +176,7 @@ void GelfWriter::ReconnectInternal()
m_Stream.first = Shared<AsioTlsStream>::Make(IoEngine::Get().GetIoContext(), *sslContext, GetHost()); m_Stream.first = Shared<AsioTlsStream>::Make(IoEngine::Get().GetIoContext(), *sslContext, GetHost());
} else { } else {
m_Stream.second = std::make_shared<AsioTcpStream>(IoEngine::Get().GetIoContext()); m_Stream.second = Shared<AsioTcpStream>::Make(IoEngine::Get().GetIoContext());
} }
try { try {

2
lib/perfdata/graphitewriter.cpp
View File

@ -187,7 +187,7 @@ void GraphiteWriter::ReconnectInternal()
Log(LogNotice, "GraphiteWriter") Log(LogNotice, "GraphiteWriter")
<< "Reconnecting to Graphite on host '" << GetHost() << "' port '" << GetPort() << "'."; << "Reconnecting to Graphite on host '" << GetHost() << "' port '" << GetPort() << "'.";
m_Stream = std::make_shared<AsioTcpStream>(IoEngine::Get().GetIoContext()); m_Stream = Shared<AsioTcpStream>::Make(IoEngine::Get().GetIoContext());
try { try {
icinga::Connect(m_Stream->lowest_layer(), GetHost(), GetPort()); icinga::Connect(m_Stream->lowest_layer(), GetHost(), GetPort());

2
lib/perfdata/graphitewriter.hpp
View File

@ -37,7 +37,7 @@ protected:
void Pause() override; void Pause() override;
private: private:
std::shared_ptr<AsioTcpStream> m_Stream; Shared<AsioTcpStream>::Ptr m_Stream;
boost::mutex m_StreamMutex; boost::mutex m_StreamMutex;
WorkQueue m_WorkQueue{10000000, 1}; WorkQueue m_WorkQueue{10000000, 1};

2
lib/perfdata/influxdbwriter.cpp
View File

@ -190,7 +190,7 @@ OptionalTlsStream InfluxdbWriter::Connect()
stream.first = Shared<AsioTlsStream>::Make(IoEngine::Get().GetIoContext(), *sslContext, GetHost()); stream.first = Shared<AsioTlsStream>::Make(IoEngine::Get().GetIoContext(), *sslContext, GetHost());
} else { } else {
stream.second = std::make_shared<AsioTcpStream>(IoEngine::Get().GetIoContext()); stream.second = Shared<AsioTcpStream>::Make(IoEngine::Get().GetIoContext());
} }
try { try {

3
lib/perfdata/opentsdbwriter.cpp
View File

@ -120,8 +120,7 @@ void OpenTsdbWriter::ReconnectTimerHandler()
* We're using telnet as input method. Future PRs may change this into using the HTTP API. * We're using telnet as input method. Future PRs may change this into using the HTTP API.
* http://opentsdb.net/docs/build/html/user_guide/writing/index.html#telnet * http://opentsdb.net/docs/build/html/user_guide/writing/index.html#telnet
*/ */
m_Stream = Shared<AsioTcpStream>::Make(IoEngine::Get().GetIoContext());
m_Stream = std::make_shared<AsioTcpStream>(IoEngine::Get().GetIoContext());
try { try {
icinga::Connect(m_Stream->lowest_layer(), GetHost(), GetPort()); icinga::Connect(m_Stream->lowest_layer(), GetHost(), GetPort());

2
lib/perfdata/opentsdbwriter.hpp
View File

@ -32,7 +32,7 @@ protected:
void Pause() override; void Pause() override;
private: private:
std::shared_ptr<AsioTcpStream> m_Stream; Shared<AsioTcpStream>::Ptr m_Stream;
Timer::Ptr m_ReconnectTimer; Timer::Ptr m_ReconnectTimer;