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

MXS-1220: Add JSON functions for servers

Browse Source 
The servers can now be printed in JSON format.
This commit is contained in:
Markus Mäkelä 2017-04-17 12:44:49 +03:00 committed by Markus Mäkelä
parent b975518996
commit c4a8f8c8a6
2 changed files with 106 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/maxscale/server.h
View File

@ -21,6 +21,7 @@
#include <maxscale/cdefs.h>
#include <maxscale/dcb.h>
#include <maxscale/resultset.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS
@ -265,6 +266,22 @@ bool server_remove_parameter(SERVER *server, const char *name);
*/
bool server_is_mxs_service(const SERVER *server);
/**
* @brief Convert a server to JSON format
*
* @param server Server to convert
*
* @return JSON representation of server or NULL if an error occurred
*/
json_t* server_to_json(SERVER* server);
/**
* @brief Convert all servers into JSON format
*
* @return JSON array of servers or NULL if an error occurred
*/
json_t* server_list_to_json();
extern int server_free(SERVER *server);
extern SERVER *server_find_by_unique_name(const char *name);
extern int server_find_by_unique_names(char **server_names, int size, SERVER*** output);

178
server/core/server.cc
View File

@ -436,99 +436,14 @@ dprintAllServers(DCB *dcb)
/**
* Print all servers in Json format to a DCB
*
* Designed to be called within a debugger session in order
* to display all active servers within the gateway
*/
void
dprintAllServersJson(DCB *dcb)
{
char *stat;
int len = 0;
int el = 1;
spinlock_acquire(&server_spin);
SERVER *server = next_active_server(allServers);
while (server)
{
server = next_active_server(server->next);
len++;
}
server = next_active_server(allServers);
dcb_printf(dcb, "[\n");
while (server)
{
dcb_printf(dcb, " {\n \"server\": \"%s\",\n",
server->name);
stat = server_status(server);
dcb_printf(dcb, " \"status\": \"%s\",\n",
stat);
MXS_FREE(stat);
dcb_printf(dcb, " \"protocol\": \"%s\",\n",
server->protocol);
dcb_printf(dcb, " \"port\": \"%d\",\n",
server->port);
if (server->server_string)
{
dcb_printf(dcb, " \"version\": \"%s\",\n",
server->server_string);
}
dcb_printf(dcb, " \"nodeId\": \"%ld\",\n",
server->node_id);
dcb_printf(dcb, " \"masterId\": \"%ld\",\n",
server->master_id);
if (server->slaves)
{
int i;
dcb_printf(dcb, " \"slaveIds\": [ ");
for (i = 0; server->slaves[i]; i++)
{
if (i == 0)
{
dcb_printf(dcb, "%li", server->slaves[i]);
}
else
{
dcb_printf(dcb, ", %li ", server->slaves[i]);
}
}
dcb_printf(dcb, "],\n");
}
dcb_printf(dcb, " \"replDepth\": \"%d\",\n",
server->depth);
if (SERVER_IS_SLAVE(server) || SERVER_IS_RELAY_SERVER(server))
{
if (server->rlag >= 0)
{
dcb_printf(dcb, " \"slaveDelay\": \"%d\",\n", server->rlag);
}
}
if (server->node_ts > 0)
{
dcb_printf(dcb, " \"lastReplHeartbeat\": \"%lu\",\n", server->node_ts);
}
dcb_printf(dcb, " \"totalConnections\": \"%d\",\n",
server->stats.n_connections);
dcb_printf(dcb, " \"currentConnections\": \"%d\",\n",
server->stats.n_current);
dcb_printf(dcb, " \"currentOps\": \"%d\"\n",
server->stats.n_current_ops);
if (el < len)
{
dcb_printf(dcb, " },\n");
}
else
{
dcb_printf(dcb, " }\n");
}
server = next_active_server(server->next);
el++;
}
dcb_printf(dcb, "]\n");
spinlock_release(&server_spin);
json_t* all_servers = server_list_to_json();
char* dump = json_dumps(all_servers, JSON_INDENT(4));
dcb_printf(dcb, "%s", dump);
MXS_FREE(dump);
}
/**
@ -1450,3 +1365,88 @@ bool server_is_mxs_service(const SERVER *server)
return rval;
}
json_t* server_list_to_json()
{
json_t* rval = json_array();
if (rval)
{
spinlock_acquire(&server_spin);
for (SERVER* server = allServers; server; server = server->next)
{
json_t* srv_json = server_to_json(server);
if (srv_json == NULL)
{
json_decref(rval);
rval = NULL;
break;
}
json_array_append_new(rval, srv_json);
}
spinlock_release(&server_spin);
}
return rval;
}
json_t* server_to_json(SERVER* server)
{
// TODO: Add error checks
json_t* rval = json_object();
json_object_set_new(rval, "name", json_string(server->unique_name));
json_object_set_new(rval, "address", json_string(server->name));
json_object_set_new(rval, "port", json_integer(server->port));
char* stat = server_status(server);
json_object_set_new(rval, "status", json_string(stat));
MXS_FREE(stat);
json_object_set_new(rval, "protocol", json_string(server->protocol));
if (server->server_string)
{
json_object_set_new(rval, "version", json_string(server->server_string));
}
json_object_set_new(rval, "node_id", json_integer(server->node_id));
json_object_set_new(rval, "master_id", json_integer(server->master_id));
json_object_set_new(rval, "replication_depth", json_integer(server->depth));
if (server->slaves)
{
json_t* slaves = json_array();
for (int i = 0; server->slaves[i]; i++)
{
json_array_append(slaves, json_integer(server->slaves[i]));
}
json_object_set_new(rval, "slaves", slaves);
}
if (server->rlag >= 0)
{
json_object_set_new(rval, "replication_lag", json_integer(server->rlag));
}
if (server->node_ts > 0)
{
json_object_set_new(rval, "last_heartbeat", json_integer(server->node_ts));
}
json_t* stats = json_object();
json_object_set_new(stats, "connections", json_integer(server->stats.n_current));
json_object_set_new(stats, "total_connections", json_integer(server->stats.n_connections));
json_object_set_new(stats, "active_operations", json_integer(server->stats.n_current_ops));
json_object_set_new(rval, "statictics", stats);
return rval;
}