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

Merge pull request #9711 from Icinga/connect-cancel

Browse Source 
Connect(): don't try next DNS record if operation is canceled
This commit is contained in:
Julian Brost 2023-03-01 15:49:53 +01:00 committed by GitHub
commit cf517050bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/base/tcpsocket.hpp
View File

@ -6,8 +6,10 @@
#include "base/i2-base.hpp" #include "base/i2-base.hpp"
#include "base/io-engine.hpp" #include "base/io-engine.hpp"
#include "base/socket.hpp" #include "base/socket.hpp"
#include <boost/asio/error.hpp>
#include <boost/asio/ip/tcp.hpp> #include <boost/asio/ip/tcp.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>
#include <boost/system/system_error.hpp>
namespace icinga namespace icinga
{ {
@ -50,8 +52,10 @@ void Connect(Socket& socket, const String& node, const String& service)
socket.connect(current->endpoint()); socket.connect(current->endpoint());
break; break;
} catch (const std::exception&) { } catch (const std::exception& ex) {
if (++current == result.end()) { auto se (dynamic_cast<const boost::system::system_error*>(&ex));
if (se && se->code() == boost::asio::error::operation_aborted || ++current == result.end()) {
throw; throw;
} }
@ -79,8 +83,10 @@ void Connect(Socket& socket, const String& node, const String& service, boost::a
socket.async_connect(current->endpoint(), yc); socket.async_connect(current->endpoint(), yc);
break; break;
} catch (const std::exception&) { } catch (const std::exception& ex) {
if (++current == result.end()) { auto se (dynamic_cast<const boost::system::system_error*>(&ex));
if (se && se->code() == boost::asio::error::operation_aborted || ++current == result.end()) {
throw; throw;
} }