From 131df25675a71ffb69286013a969741f9d278181 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 17 Jun 2019 15:46:57 +0200 Subject: [PATCH] dnsdist: Make the frontend code dedup clearer --- pdns/dnsdist-carbon.cc | 8 ++++---- pdns/dnsdist-web.cc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pdns/dnsdist-carbon.cc b/pdns/dnsdist-carbon.cc index b0b2997c2..e3fc46fa1 100644 --- a/pdns/dnsdist-carbon.cc +++ b/pdns/dnsdist-carbon.cc @@ -113,9 +113,9 @@ try string frontName = front->local.toString() + ":" + std::to_string(front->local.getPort()) + (front->udpFD >= 0 ? "_udp" : "_tcp"); boost::replace_all(frontName, ".", "_"); auto dupPair = frontendDuplicates.insert({frontName, 1}); - if (dupPair.second == false) { + if (!dupPair.second) { frontName = frontName + "_" + std::to_string(dupPair.first->second); - ++dupPair.first->second; + ++(dupPair.first->second); } const string base = namespace_name + "." + hostname + "." + instance_name + ".frontends." + frontName + "."; @@ -167,9 +167,9 @@ try boost::replace_all(name, "]", "_"); auto dupPair = dohFrontendDuplicates.insert({name, 1}); - if (dupPair.second == false) { + if (!dupPair.second) { name = name + "_" + std::to_string(dupPair.first->second); - ++dupPair.first->second; + ++(dupPair.first->second); } vector&>> v{ diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc index f0ff9602c..a31c1a924 100644 --- a/pdns/dnsdist-web.cc +++ b/pdns/dnsdist-web.cc @@ -532,9 +532,9 @@ static void connectionThread(int sock, ComboAddress remote) string proto = (front->udpFD >= 0 ? "udp" : "tcp"); string fullName = frontName + "_" + proto; auto dupPair = frontendDuplicates.insert({fullName, 1}); - if (dupPair.second == false) { + if (!dupPair.second) { frontName = frontName + "_" + std::to_string(dupPair.first->second); - ++dupPair.first->second; + ++(dupPair.first->second); } output << "dnsdist_frontend_queries{frontend=\"" << frontName << "\",proto=\"" << proto -- 2.40.0