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

Move monitor-dependent code in MariaDBServer to MariaDBMonitor

Browse Source 
Removes Monitor-dependency from the MariaDBServer-class.
This commit is contained in:
Esa Korhonen
2018-06-06 21:49:55 +03:00
parent 6d1863451a
commit 2481de260f
4 changed files with 67 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/monitor/mariadbmon/mariadbserver.hh
View File

@ -25,7 +25,6 @@ enum print_repl_warnings_t
};
class QueryResult;
class MariaDBMonitor;
class MariaDBServer;
// Server pointer array
typedef std::vector<MariaDBServer*> ServerArray;
@ -134,6 +133,9 @@ public:
NodeData m_node; /**< Replication topology data */
MariaDBServer(MXS_MONITORED_SERVER* monitored_server);
void monitor_server();
void update_server_info();
/**
* Calculate how many events are left in the relay log.
*
@ -328,14 +330,6 @@ public:
*/
bool run_sql_from_file(const std::string& path, json_t** error_out);
/**
* Query and update information of this server. Sets some values for status bits,
* but these may be added or overridden by later methods.
*
* @param base_monitor The base monitor object monitoring this server. Required for connection settings.
*/
void update_server(MariaDBMonitor& monitor);
/**
* Clear server pending status flags.
*
@ -351,9 +345,7 @@ public:
void set_status(uint64_t bits);
private:
void monitor_server(MariaDBMonitor& monitor);
bool update_slave_status(std::string* errmsg_out = NULL);
void update_server_info();
};
/**