From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 28 Jul 2016 13:50:08 +0000 (+0200)
Subject: dnsdist: API now sends pools as a JSON array instead of a string
X-Git-Tag: rec-4.0.2~52^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F4246%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: API now sends pools as a JSON array instead of a string
---

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);
       }