hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make JSON output valid

Browse Source
This commit is contained in:
Guillaume Lefranc
2015-02-19 13:55:29 +01:00
parent 72eb89a787
commit b8b75b604f
1 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
server/core/server.c
View File

@ -304,31 +304,40 @@ dprintAllServersJson(DCB *dcb)
{ {
SERVER *ptr; SERVER *ptr;
char *stat; char *stat;
int len = 0;
int el = 1;
spinlock_acquire(&server_spin); spinlock_acquire(&server_spin);
ptr = allServers; ptr = allServers;
while (ptr) while (ptr)
{ {
dcb_printf(dcb, "{\n \"server\": \"%s\",\n", ptr = ptr->next;
len++;
}
ptr = allServers;
dcb_printf(dcb, "[\n");
while (ptr)
{
dcb_printf(dcb, " {\n \"server\": \"%s\",\n",
ptr->name); ptr->name);
stat = server_status(ptr); stat = server_status(ptr);
dcb_printf(dcb, " \"status\": \"%s\",\n", dcb_printf(dcb, " \"status\": \"%s\",\n",
stat); stat);
free(stat); free(stat);
dcb_printf(dcb, " \"protocol\": \"%s\",\n", dcb_printf(dcb, " \"protocol\": \"%s\",\n",
ptr->protocol); ptr->protocol);
dcb_printf(dcb, " \"port\": \"%d\",\n", dcb_printf(dcb, " \"port\": \"%d\",\n",
ptr->port); ptr->port);
if (ptr->server_string) if (ptr->server_string)
dcb_printf(dcb, " \"version\": \"%s\",\n", dcb_printf(dcb, " \"version\": \"%s\",\n",
ptr->server_string); ptr->server_string);
dcb_printf(dcb, " \"nodeId\": \"%d\",\n", dcb_printf(dcb, " \"nodeId\": \"%d\",\n",
ptr->node_id); ptr->node_id);
dcb_printf(dcb, " \"masterId\": \"%d\",\n", dcb_printf(dcb, " \"masterId\": \"%d\",\n",
ptr->master_id); ptr->master_id);
if (ptr->slaves) { if (ptr->slaves) {
int i; int i;
dcb_printf(dcb, " \"slaveIds\": [ "); dcb_printf(dcb, " \"slaveIds\": [ ");
for (i = 0; ptr->slaves[i]; i++) for (i = 0; ptr->slaves[i]; i++)
{ {
if (i == 0) if (i == 0)
@ -338,25 +347,32 @@ char *stat;
} }
dcb_printf(dcb, "],\n"); dcb_printf(dcb, "],\n");
} }
dcb_printf(dcb, " \"replDepth\": \"%d\",\n", dcb_printf(dcb, " \"replDepth\": \"%d\",\n",
ptr->depth); ptr->depth);
if (SERVER_IS_SLAVE(ptr) || SERVER_IS_RELAY_SERVER(ptr)) { if (SERVER_IS_SLAVE(ptr) || SERVER_IS_RELAY_SERVER(ptr)) {
if (ptr->rlag >= 0) { if (ptr->rlag >= 0) {
dcb_printf(dcb, " \"slaveDelay\": \"%d\",\n", ptr->rlag); dcb_printf(dcb, " \"slaveDelay\": \"%d\",\n", ptr->rlag);
} }
} }
if (ptr->node_ts > 0) { if (ptr->node_ts > 0) {
dcb_printf(dcb, " \"lastReplHeartbeat\": \"%lu\",\n", ptr->node_ts); dcb_printf(dcb, " \"lastReplHeartbeat\": \"%lu\",\n", ptr->node_ts);
} }
dcb_printf(dcb, " \"totalConnections\": \"%d\",\n", dcb_printf(dcb, " \"totalConnections\": \"%d\",\n",
ptr->stats.n_connections); ptr->stats.n_connections);
dcb_printf(dcb, " \"currentConnections\": \"%d\",\n", dcb_printf(dcb, " \"currentConnections\": \"%d\",\n",
ptr->stats.n_current); ptr->stats.n_current);
dcb_printf(dcb, " \"currentOps\": \"%d\",\n", dcb_printf(dcb, " \"currentOps\": \"%d\"\n",
ptr->stats.n_current_ops); ptr->stats.n_current_ops);
dcb_printf(dcb, "}\n"); if (el < len) {
dcb_printf(dcb, " },\n");
}
else {
dcb_printf(dcb, " }\n");
}
ptr = ptr->next; ptr = ptr->next;
el++;
} }
dcb_printf(dcb, "]\n");
spinlock_release(&server_spin); spinlock_release(&server_spin);
} }