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

RedisConnection#Connect(): don't give up

Browse Source
This commit is contained in:
Alexander A. Klimov 2019-11-26 14:08:46 +01:00
parent e7ce71095a
commit e522db20b1
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/icingadb/redisconnection.cpp
View File

@ -9,9 +9,9 @@
#include "base/objectlock.hpp" #include "base/objectlock.hpp"
#include "base/string.hpp" #include "base/string.hpp"
#include "base/tcpsocket.hpp" #include "base/tcpsocket.hpp"
#include <boost/asio/post.hpp> #include <boost/asio.hpp>
#include <boost/asio/spawn.hpp>
#include <boost/coroutine/exceptions.hpp> #include <boost/coroutine/exceptions.hpp>
#include <boost/date_time/posix_time/posix_time_duration.hpp>
#include <boost/utility/string_view.hpp> #include <boost/utility/string_view.hpp>
#include <boost/variant/get.hpp> #include <boost/variant/get.hpp>
#include <exception> #include <exception>
@ -144,32 +144,42 @@ void RedisConnection::Connect(asio::yield_context& yc)
{ {
Defer notConnecting ([this]() { m_Connecting.store(m_Connected.load()); }); Defer notConnecting ([this]() { m_Connecting.store(m_Connected.load()); });
try { boost::asio::deadline_timer timer (m_Strand.context());
if (m_Path.IsEmpty()) {
Log(LogInformation, "IcingaDB")
<< "Trying to connect to Redis server (async) on host '" << m_Host << ":" << m_Port << "'";
decltype(m_TcpConn) conn (new TcpConn(m_Strand.context())); for (;;) {
icinga::Connect(conn->next_layer(), m_Host, Convert::ToString(m_Port), yc); try {
m_TcpConn = std::move(conn); if (m_Path.IsEmpty()) {
} else { Log(LogInformation, "IcingaDB")
Log(LogInformation, "IcingaDB") << "Trying to connect to Redis server (async) on host '" << m_Host << ":" << m_Port << "'";
<< "Trying to connect to Redis server (async) on unix socket path '" << m_Path << "'";
decltype(m_UnixConn) conn (new UnixConn(m_Strand.context())); decltype(m_TcpConn) conn (new TcpConn(m_Strand.context()));
conn->next_layer().async_connect(Unix::endpoint(m_Path.CStr()), yc); icinga::Connect(conn->next_layer(), m_Host, Convert::ToString(m_Port), yc);
m_UnixConn = std::move(conn); m_TcpConn = std::move(conn);
} else {
Log(LogInformation, "IcingaDB")
<< "Trying to connect to Redis server (async) on unix socket path '" << m_Path << "'";
decltype(m_UnixConn) conn (new UnixConn(m_Strand.context()));
conn->next_layer().async_connect(Unix::endpoint(m_Path.CStr()), yc);
m_UnixConn = std::move(conn);
}
m_Connected.store(true);
Log(LogInformation, "IcingaDB", "Connected to Redis server");
break;
} catch (const boost::coroutines::detail::forced_unwind&) {
throw;
} catch (const std::exception& ex) {
Log(LogCritical, "IcingaDB")
<< "Cannot connect to " << m_Host << ":" << m_Port << ": " << ex.what();
} }
m_Connected.store(true); timer.expires_from_now(boost::posix_time::seconds(5));
timer.async_wait(yc);
Log(LogInformation, "IcingaDB", "Connected to Redis server");
} catch (const boost::coroutines::detail::forced_unwind&) {
throw;
} catch (const std::exception& ex) {
Log(LogCritical, "IcingaDB")
<< "Cannot connect to " << m_Host << ":" << m_Port << ": " << ex.what();
} }
} }
void RedisConnection::ReadLoop(asio::yield_context& yc) void RedisConnection::ReadLoop(asio::yield_context& yc)