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

Don't call Timeout#Cancel() where Timeout#~Timeout() is called

Browse Source
This commit is contained in:
Alexander A. Klimov 2024-12-02 16:06:58 +01:00 committed by Yonas Habteab
parent fe1420523a
commit 1703f99d14
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/base/tlsstream.cpp
View File

@ -146,9 +146,6 @@ void AsioTlsStream::GracefulDisconnect(boost::asio::io_context::strand& strand,
ForceDisconnect(); ForceDisconnect();
} }
)); ));
Defer cancelTimeout ([&shutdownTimeout]() {
shutdownTimeout->Cancel();
});
// Close the TLS connection, effectively uses SSL_shutdown() to send a close_notify shutdown alert to the peer. // Close the TLS connection, effectively uses SSL_shutdown() to send a close_notify shutdown alert to the peer.
boost::system::error_code ec; boost::system::error_code ec;

3
lib/icingadb/redisconnection.cpp
View File

@ -318,7 +318,6 @@ void RedisConnection::Connect(asio::yield_context& yc)
auto conn (Shared<AsioTlsStream>::Make(m_Strand.context(), *m_TLSContext, m_Host)); auto conn (Shared<AsioTlsStream>::Make(m_Strand.context(), *m_TLSContext, m_Host));
auto& tlsConn (conn->next_layer()); auto& tlsConn (conn->next_layer());
auto connectTimeout (MakeTimeout(conn)); auto connectTimeout (MakeTimeout(conn));
Defer cancelTimeout ([&connectTimeout]() { connectTimeout->Cancel(); });
icinga::Connect(conn->lowest_layer(), m_Host, Convert::ToString(m_Port), yc); icinga::Connect(conn->lowest_layer(), m_Host, Convert::ToString(m_Port), yc);
tlsConn.async_handshake(tlsConn.client, yc); tlsConn.async_handshake(tlsConn.client, yc);
@ -348,7 +347,6 @@ void RedisConnection::Connect(asio::yield_context& yc)
auto conn (Shared<TcpConn>::Make(m_Strand.context())); auto conn (Shared<TcpConn>::Make(m_Strand.context()));
auto connectTimeout (MakeTimeout(conn)); auto connectTimeout (MakeTimeout(conn));
Defer cancelTimeout ([&connectTimeout]() { connectTimeout->Cancel(); });
icinga::Connect(conn->next_layer(), m_Host, Convert::ToString(m_Port), yc); icinga::Connect(conn->next_layer(), m_Host, Convert::ToString(m_Port), yc);
Handshake(conn, yc); Handshake(conn, yc);
@ -361,7 +359,6 @@ void RedisConnection::Connect(asio::yield_context& yc)
auto conn (Shared<UnixConn>::Make(m_Strand.context())); auto conn (Shared<UnixConn>::Make(m_Strand.context()));
auto connectTimeout (MakeTimeout(conn)); auto connectTimeout (MakeTimeout(conn));
Defer cancelTimeout ([&connectTimeout]() { connectTimeout->Cancel(); });
conn->next_layer().async_connect(Unix::endpoint(m_Path.CStr()), yc); conn->next_layer().async_connect(Unix::endpoint(m_Path.CStr()), yc);
Handshake(conn, yc); Handshake(conn, yc);

2
lib/methods/ifwapichecktask.cpp
View File

@ -467,8 +467,6 @@ void IfwApiCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRes
} }
); );
Defer cancelTimeout ([&timeout]() { timeout->Cancel(); });
DoIfwNetIo(yc, cr, psCommand, psHost, expectedSan, psPort, *conn, *req); DoIfwNetIo(yc, cr, psCommand, psHost, expectedSan, psPort, *conn, *req);
cr->SetExecutionEnd(Utility::GetTime()); cr->SetExecutionEnd(Utility::GetTime());

4
lib/remote/apilistener.cpp
View File

@ -543,7 +543,6 @@ void ApiListener::ListenerCoroutineProc(boost::asio::yield_context yc, const Sha
sslConn->lowest_layer().cancel(ec); sslConn->lowest_layer().cancel(ec);
} }
)); ));
Defer cancelTimeout([timeout]() { timeout->Cancel(); });
NewClientHandler(yc, strand, sslConn, String(), RoleServer); NewClientHandler(yc, strand, sslConn, String(), RoleServer);
}); });
@ -595,7 +594,6 @@ void ApiListener::AddConnection(const Endpoint::Ptr& endpoint)
sslConn->lowest_layer().cancel(ec); sslConn->lowest_layer().cancel(ec);
} }
)); ));
Defer cancelTimeout([&timeout]() { timeout->Cancel(); });
Connect(sslConn->lowest_layer(), host, port, yc); Connect(sslConn->lowest_layer(), host, port, yc);
@ -693,8 +691,6 @@ void ApiListener::NewClientHandlerInternal(
)); ));
sslConn.async_handshake(role == RoleClient ? sslConn.client : sslConn.server, yc[ec]); sslConn.async_handshake(role == RoleClient ? sslConn.client : sslConn.server, yc[ec]);
handshakeTimeout->Cancel();
} }
if (ec) { if (ec) {