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

Cleaned up unused variables.

Browse Source
This commit is contained in:
Markus Makela
2015-03-11 18:12:18 +02:00
parent 63d83cd85d
commit 90875c1164
7 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/core/config.c
View File

@ -846,9 +846,6 @@ int error_count = 0;
char *user; char *user;
char *passwd; char *passwd;
unsigned long interval = 0; unsigned long interval = 0;
int replication_heartbeat = 0;
int detect_stale_master = 0;
int disable_master_failback = 0;
int connect_timeout = 0; int connect_timeout = 0;
int read_timeout = 0; int read_timeout = 0;
int write_timeout = 0; int write_timeout = 0;
@ -861,18 +858,6 @@ int error_count = 0;
interval = strtoul(config_get_value(obj->parameters, "monitor_interval"), NULL, 10); interval = strtoul(config_get_value(obj->parameters, "monitor_interval"), NULL, 10);
} }
if (config_get_value(obj->parameters, "detect_replication_lag")) {
replication_heartbeat = atoi(config_get_value(obj->parameters, "detect_replication_lag"));
}
if (config_get_value(obj->parameters, "detect_stale_master")) {
detect_stale_master = atoi(config_get_value(obj->parameters, "detect_stale_master"));
}
if (config_get_value(obj->parameters, "disable_master_failback")) {
disable_master_failback = atoi(config_get_value(obj->parameters, "disable_master_failback"));
}
if (config_get_value(obj->parameters, "backend_connect_timeout")) { if (config_get_value(obj->parameters, "backend_connect_timeout")) {
connect_timeout = atoi(config_get_value(obj->parameters, "backend_connect_timeout")); connect_timeout = atoi(config_get_value(obj->parameters, "backend_connect_timeout"));
} }

4
server/include/monitor.h
View File

@ -135,11 +135,7 @@ extern void monitorStopAll();
extern void monitorShowAll(DCB *); extern void monitorShowAll(DCB *);
extern void monitorShow(DCB *, MONITOR *); extern void monitorShow(DCB *, MONITOR *);
extern void monitorList(DCB *); extern void monitorList(DCB *);
extern void monitorSetId(MONITOR *, unsigned long);
extern void monitorSetInterval (MONITOR *, unsigned long); extern void monitorSetInterval (MONITOR *, unsigned long);
extern void monitorSetReplicationHeartbeat(MONITOR *, int);
extern void monitorDetectStaleMaster(MONITOR *, int);
extern void monitorDisableMasterFailback(MONITOR *, int);
extern void monitorSetNetworkTimeout(MONITOR *, int, int); extern void monitorSetNetworkTimeout(MONITOR *, int, int);
extern RESULTSET *monitorGetList(); extern RESULTSET *monitorGetList();
#endif #endif

2
server/include/service.h
View File

@ -182,6 +182,8 @@ extern int serviceSetTimeout(SERVICE *, int );
extern void serviceWeightBy(SERVICE *, char *); extern void serviceWeightBy(SERVICE *, char *);
extern char *serviceGetWeightingParameter(SERVICE *); extern char *serviceGetWeightingParameter(SERVICE *);
extern int serviceEnableLocalhostMatchWildcardHost(SERVICE *, int); extern int serviceEnableLocalhostMatchWildcardHost(SERVICE *, int);
int serviceStripDbEsc(SERVICE* service, int action);
int serviceAuthAllServers(SERVICE *service, int action);
extern void service_update(SERVICE *, char *, char *, char *); extern void service_update(SERVICE *, char *, char *, char *);
extern int service_refresh_users(SERVICE *); extern int service_refresh_users(SERVICE *);
extern void printService(SERVICE *); extern void printService(SERVICE *);

2
server/modules/monitor/galera_mon.c
View File

@ -155,7 +155,7 @@ CONFIG_PARAMETER* params = (CONFIG_PARAMETER*)opt;
handle->shutdown = 0; handle->shutdown = 0;
handle->defaultUser = NULL; handle->defaultUser = NULL;
handle->defaultPasswd = NULL; handle->defaultPasswd = NULL;
handle->id = config_get_gateway_id(); handle->id = MONITOR_DEFAULT_ID;
handle->interval = MONITOR_INTERVAL; handle->interval = MONITOR_INTERVAL;
handle->disableMasterFailback = 0; handle->disableMasterFailback = 0;
handle->master = NULL; handle->master = NULL;

2
server/modules/monitor/mm_mon.c
View File

@ -146,7 +146,7 @@ CONFIG_PARAMETER* params = (CONFIG_PARAMETER*)opt;
handle->shutdown = 0; handle->shutdown = 0;
handle->defaultUser = NULL; handle->defaultUser = NULL;
handle->defaultPasswd = NULL; handle->defaultPasswd = NULL;
handle->id = config_get_gateway_id(); handle->id = MONITOR_DEFAULT_ID;
handle->interval = MONITOR_INTERVAL; handle->interval = MONITOR_INTERVAL;
handle->replicationHeartbeat = 0; handle->replicationHeartbeat = 0;
handle->detectStaleMaster = 0; handle->detectStaleMaster = 0;

2
server/modules/monitor/ndbcluster_mon.c
View File

@ -142,7 +142,7 @@ CONFIG_PARAMETER* params = (CONFIG_PARAMETER*)opt;
handle->shutdown = 0; handle->shutdown = 0;
handle->defaultUser = NULL; handle->defaultUser = NULL;
handle->defaultPasswd = NULL; handle->defaultPasswd = NULL;
handle->id = config_get_gateway_id(); handle->id = MONITOR_DEFAULT_ID;
handle->interval = MONITOR_INTERVAL; handle->interval = MONITOR_INTERVAL;
handle->connect_timeout=DEFAULT_CONNECT_TIMEOUT; handle->connect_timeout=DEFAULT_CONNECT_TIMEOUT;
handle->read_timeout=DEFAULT_READ_TIMEOUT; handle->read_timeout=DEFAULT_READ_TIMEOUT;

18
server/modules/routing/debugcmd.c
View File

@ -1207,7 +1207,14 @@ restart_monitor(DCB *dcb, MONITOR *monitor)
static void static void
enable_monitor_replication_heartbeat(DCB *dcb, MONITOR *monitor) enable_monitor_replication_heartbeat(DCB *dcb, MONITOR *monitor)
{ {
monitorSetReplicationHeartbeat(monitor, 1); CONFIG_PARAMETER param;
const char* name = "detect_replication_lag";
const char* value = "1";
param.name = (char*)name;
param.value = (char*)value;
param.next = NULL;
monitorStop(monitor);
monitorStart(monitor,&param);
} }
/** /**
@ -1219,7 +1226,14 @@ enable_monitor_replication_heartbeat(DCB *dcb, MONITOR *monitor)
static void static void
disable_monitor_replication_heartbeat(DCB *dcb, MONITOR *monitor) disable_monitor_replication_heartbeat(DCB *dcb, MONITOR *monitor)
{ {
monitorSetReplicationHeartbeat(monitor, 0); CONFIG_PARAMETER param;
const char* name = "detect_replication_lag";
const char* value = "0";
param.name = (char*)name;
param.value = (char*)value;
param.next = NULL;
monitorStop(monitor);
monitorStart(monitor,&param);
} }
/** /**