From 357c22dd8b544fc6300c47958dd738f5b0c1b2d5 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 28 Jul 2016 15:50:08 +0200 Subject: [PATCH] dnsdist: API now sends pools as a JSON array instead of a string --- pdns/dnsdist-web.cc | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc index 199a40320d..e5a6e9939c 100644 --- a/pdns/dnsdist-web.cc +++ b/pdns/dnsdist-web.cc @@ -224,24 +224,25 @@ static void connectionThread(int sock, ComboAddress remote, string password, str status = "DOWN"; else status = (a->upStatus ? "up" : "down"); - string pools; + Json::array pools; for(const auto& p: a->pools) - pools+=p+" "; + pools.push_back(p); + Json::object server{ - {"id", num++}, + {"id", num++}, {"name", a->name}, - {"address", a->remote.toStringWithPort()}, - {"state", status}, - {"qps", (int)a->queryLoad}, - {"qpsLimit", (int)a->qps.getRate()}, - {"outstanding", (int)a->outstanding}, - {"reuseds", (int)a->reuseds}, - {"weight", (int)a->weight}, - {"order", (int)a->order}, - {"pools", pools}, - {"latency", (int)(a->latencyUsec/1000.0)}, - {"queries", (int)a->queries}}; - + {"address", a->remote.toStringWithPort()}, + {"state", status}, + {"qps", (int)a->queryLoad}, + {"qpsLimit", (int)a->qps.getRate()}, + {"outstanding", (int)a->outstanding}, + {"reuseds", (int)a->reuseds}, + {"weight", (int)a->weight}, + {"order", (int)a->order}, + {"pools", pools}, + {"latency", (int)(a->latencyUsec/1000.0)}, + {"queries", (int)a->queries}}; + servers.push_back(server); } -- 2.47.2