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

MXS-1775 Reset server info in MariaDBMonitor::configure()

Browse Source 
That way, MariaDBMonitor no longer needs a custome start() function.
This commit is contained in:
Johan Wikman
2018-05-28 14:18:02 +03:00
parent be3bdc7bc9
commit 5219245a04
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -157,9 +157,6 @@ bool MariaDBMonitor::start(const MXS_CONFIG_PARAMETER* params)
{ {
bool error = false; bool error = false;
m_shutdown = false; m_shutdown = false;
/* Reset all monitored state info. The server dependent values must be reset as servers could have been
* added, removed and modified. */
reset_server_info();
if (!configure(params)) if (!configure(params))
{ {
@ -188,6 +185,10 @@ bool MariaDBMonitor::start(const MXS_CONFIG_PARAMETER* params)
*/ */
bool MariaDBMonitor::configure(const MXS_CONFIG_PARAMETER* params) bool MariaDBMonitor::configure(const MXS_CONFIG_PARAMETER* params)
{ {
/* Reset all monitored state info. The server dependent values must be reset as servers could have been
* added, removed and modified. */
reset_server_info();
m_detect_stale_master = config_get_bool(params, "detect_stale_master"); m_detect_stale_master = config_get_bool(params, "detect_stale_master");
m_detect_stale_slave = config_get_bool(params, "detect_stale_slave"); m_detect_stale_slave = config_get_bool(params, "detect_stale_slave");
m_detect_replication_lag = config_get_bool(params, "detect_replication_lag"); m_detect_replication_lag = config_get_bool(params, "detect_replication_lag");