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

MXS-1775 Remove destroy()

Browse Source 
Now the instance is deleted simply by deleting it.
This commit is contained in:
Johan Wikman
2018-05-25 09:20:31 +03:00
parent 0833db8a48
commit b439857a84
13 changed files with 8 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/monitor/galeramon/galeramon.cc
View File

@ -142,11 +142,6 @@ GaleraMonitor* GaleraMonitor::create(MXS_MONITOR* monitor)
return new GaleraMonitor(monitor);
}
void GaleraMonitor::destroy()
{
delete this;
}
bool GaleraMonitor::has_sufficient_permissions() const
{
return check_monitor_permissions(m_monitor, "SHOW STATUS LIKE 'wsrep_local_state'");

3
server/modules/monitor/galeramon/galeramon.hh
View File

@ -58,8 +58,8 @@ public:
GaleraMonitor(const GaleraMonitor&) = delete;
GaleraMonitor& operator = (const GaleraMonitor&) = delete;
~GaleraMonitor();
static GaleraMonitor* create(MXS_MONITOR* monitor);
void destroy();
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;
@ -78,7 +78,6 @@ private:
bool m_log_no_members; /**< Should we log if no member are found. */
GaleraMonitor(MXS_MONITOR* monitor);
~GaleraMonitor();
bool detect_cluster_size(const int n_nodes,
const char *candidate_uuid,