From 71bc2ba3eee2b2e7f7815f18862db0673f0fb0b0 Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Thu, 29 May 2014 09:43:21 +0200 Subject: [PATCH] set maxscale_id updated set maxscale_id updated --- server/core/config.c | 14 +++++++------- server/modules/monitor/mysql_mon.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/core/config.c b/server/core/config.c index 8ca8f1750..01ae489b3 100644 --- a/server/core/config.c +++ b/server/core/config.c @@ -428,12 +428,19 @@ int error_count = 0; char *port; char *protocol; char *socket; + struct sockaddr_in serv_addr; service = config_get_value(obj->parameters, "service"); port = config_get_value(obj->parameters, "port"); address = config_get_value(obj->parameters, "address"); protocol = config_get_value(obj->parameters, "protocol"); socket = config_get_value(obj->parameters, "socket"); + + /* if id is not set, do it now */ + if (gateway.id == 0) { + setipaddress(&serv_addr.sin_addr, (address == NULL) ? "0.0.0.0" : address); + gateway.id = (unsigned long) (serv_addr.sin_addr.s_addr + port + getpid()); + } if (service && socket && protocol) { CONFIG_CONTEXT *ptr = context; @@ -1035,7 +1042,6 @@ SERVER *server; char *protocol; char *address; char *socket; - struct sockaddr_in serv_addr; service = config_get_value(obj->parameters, "service"); address = config_get_value(obj->parameters, "address"); @@ -1043,12 +1049,6 @@ SERVER *server; protocol = config_get_value(obj->parameters, "protocol"); socket = config_get_value(obj->parameters, "socket"); - /* if id is not set, do it now */ - if (gateway.id == 0) { - setipaddress(&serv_addr.sin_addr, (address == NULL) ? "0.0.0.0" : address); - gateway.id = (unsigned long) (serv_addr.sin_addr.s_addr + port + getpid()); - } - if (service && socket && protocol) { CONFIG_CONTEXT *ptr = context; diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c index 8d393af0c..96f842383 100644 --- a/server/modules/monitor/mysql_mon.c +++ b/server/modules/monitor/mysql_mon.c @@ -271,7 +271,7 @@ char *sep; dcb_printf(dcb,"\tSampling interval:\t%lu milliseconds\n", handle->interval); dcb_printf(dcb,"\tMaxScale MonitorId:\t%lu\n", handle->id); - dcb_printf(dcb,"\tReplication lag check:\t%s\n", (handle->replicationHeartbeat == 1) ? "enabled" : "disabled"); + dcb_printf(dcb,"\tReplication lag:\t%s\n", (handle->replicationHeartbeat == 1) ? "enabled" : "disabled"); dcb_printf(dcb, "\tMonitored servers: "); db = handle->databases;