]> granicus.if.org Git - pdns/commitdiff
dnsdist: API now sends pools as a JSON array instead of a string
authorRemi Gacogne <remi.gacogne@powerdns.com>
Thu, 28 Jul 2016 13:50:08 +0000 (15:50 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Thu, 28 Jul 2016 13:50:08 +0000 (15:50 +0200)
pdns/dnsdist-web.cc

index 199a40320de3e393f6b6b6860aa6cb2c32d54fb9..e5a6e9939cd877f1696562d1b9ec58b11fae1fd7 100644 (file)
@@ -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);
       }