summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2018-05-24 14:16:30 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2018-06-25 12:06:21 +0200
commit6101d018f07ebf103be7290b9e687625353644c0 (patch)
tree6c694b2ed9c0a7c5bbc9c6a0bac5a2ec638b26b9
parent564c2de32aad723c4572ce7fe502e91fcf563730 (diff)
Handle a missed case of timed out ip addresses
Correctly register timed out IP addresses from a timed out select() call as a bad address so we do not try it again. LP: #1766542 (cherry picked from commit 71b65b3563d223f6cd69261918ec06d10da48e6c)
-rw-r--r--methods/connect.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/methods/connect.cc b/methods/connect.cc
index 519031ace..f3af5fd4a 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -308,6 +308,7 @@ static ResultState WaitAndCheckErrors(std::list<Connection> &Conns, std::unique_
for (auto &Conn : Conns)
{
Conn.Owner->SetFailReason("Timeout");
+ bad_addr.insert(bad_addr.begin(), Conn.Name);
_error->Error(_("Could not connect to %s:%s (%s), "
"connection timed out"),
Conn.Host.c_str(), Conn.Service, Conn.Name);