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

Update

Browse Source 
Update
This commit is contained in:
MassimilianoPinto
2014-05-26 16:49:10 +02:00
parent b54ca8e87f
commit 933025b017
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/core/server.c
View File

@ -68,6 +68,7 @@ SERVER *server;
server->nextdb = NULL; server->nextdb = NULL;
server->monuser = NULL; server->monuser = NULL;
server->monpw = NULL; server->monpw = NULL;
server->server_string = NULL;
server->node_id = -1; server->node_id = -1;
spinlock_acquire(&server_spin); spinlock_acquire(&server_spin);
@ -111,6 +112,8 @@ SERVER *ptr;
/* Clean up session and free the memory */ /* Clean up session and free the memory */
free(server->name); free(server->name);
free(server->protocol); free(server->protocol);
if (server->server_string)
free(server->server_string);
free(server); free(server);
return 1; return 1;
} }
@ -199,9 +202,11 @@ char *stat;
free(stat); free(stat);
dcb_printf(dcb, "\tProtocol: %s\n", ptr->protocol); dcb_printf(dcb, "\tProtocol: %s\n", ptr->protocol);
dcb_printf(dcb, "\tPort: %d\n", ptr->port); 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, "\tNode Id: %d\n", ptr->node_id);
dcb_printf(dcb, "\tNumber of connections: %d\n", ptr->stats.n_connections); 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; ptr = ptr->next;
} }
spinlock_release(&server_spin); spinlock_release(&server_spin);
@ -225,9 +230,11 @@ char *stat;
free(stat); free(stat);
dcb_printf(dcb, "\tProtocol: %s\n", server->protocol); dcb_printf(dcb, "\tProtocol: %s\n", server->protocol);
dcb_printf(dcb, "\tPort: %d\n", server->port); 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, "\tNode Id: %d\n", server->node_id);
dcb_printf(dcb, "\tNumber of connections: %d\n", server->stats.n_connections); 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);
} }
/** /**

1
server/include/server.h
View File

@ -61,6 +61,7 @@ typedef struct server {
SERVER_STATS stats; /**< The server statistics */ SERVER_STATS stats; /**< The server statistics */
struct server *next; /**< Next server */ struct server *next; /**< Next server */
struct server *nextdb; /**< Next server in list attached to a service */ struct server *nextdb; /**< Next server in list attached to a service */
char *server_string; /**< Server version string, i.e. MySQL server version */
long node_id; /**< Node id, server_id for M/S or local_index for Galera */ long node_id; /**< Node id, server_id for M/S or local_index for Galera */
} SERVER; } SERVER;