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

Merge branch 'feature-MAX-58' into develop

Browse Source 
Merge branch 'feature-MAX-58' into develop
This commit is contained in:
MassimilianoPinto
2014-05-28 09:31:29 +02:00
parent 70115d35c9 933025b017
commit a45e009dfe
3 changed files with 86 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/server.c
View File

@ -26,6 +26,7 @@
* 18/06/13 Mark Riddoch Initial implementation
* 17/05/14 Mark Riddoch Addition of unique_name
* 20/05/14 Massimiliano Pinto Addition of server_string
* 21/05/14 Massimiliano Pinto Addition of node_id
*
* @endverbatim
*/
@ -71,6 +72,7 @@ SERVER *server;
server->monpw = NULL;
server->unique_name = NULL;
server->server_string = NULL;
server->node_id = -1;
spinlock_acquire(&server_spin);
server->next = allServers;
@ -244,8 +246,9 @@ char *stat;
dcb_printf(dcb, "\tPort: %d\n", ptr->port);
if (ptr->server_string)
dcb_printf(dcb, "\tServer Version:\t\t%s\n", ptr->server_string);
dcb_printf(dcb, "\tNode Id: %d\n", ptr->node_id);
dcb_printf(dcb, "\tNumber of connections: %d\n", ptr->stats.n_connections);
dcb_printf(dcb, "\tCurrent no. of connections: %d\n", ptr->stats.n_current);
dcb_printf(dcb, "\tCurrent no. of conns: %d\n", ptr->stats.n_current);
ptr = ptr->next;
}
spinlock_release(&server_spin);
@ -271,8 +274,9 @@ char *stat;
dcb_printf(dcb, "\tPort: %d\n", server->port);
if (server->server_string)
dcb_printf(dcb, "\tServer Version:\t\t%s\n", server->server_string);
dcb_printf(dcb, "\tNode Id: %d\n", server->node_id);
dcb_printf(dcb, "\tNumber of connections: %d\n", server->stats.n_connections);
dcb_printf(dcb, "\tCurrent No. of connections: %d\n", server->stats.n_current);
dcb_printf(dcb, "\tCurrent No. of conns: %d\n", server->stats.n_current);
}
/**