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/mmmon/mmmon.cc
View File

@ -101,11 +101,6 @@ MMMonitor* MMMonitor::create(MXS_MONITOR* monitor)
return new MMMonitor(monitor);
}
void MMMonitor::destroy()
{
delete this;
}
bool MMMonitor::has_sufficient_permissions() const
{
return check_monitor_permissions(m_monitor, "SHOW SLAVE STATUS");

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

@ -26,8 +26,8 @@ public:
MMMonitor(const MMMonitor&) = delete;
MMMonitor& operator = (const MMMonitor&) = delete;
~MMMonitor();
static MMMonitor* create(MXS_MONITOR* monitor);
void destroy();
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;
@ -36,7 +36,6 @@ private:
int m_detectStaleMaster; /**< Monitor flag for Stale Master detection */
MMMonitor(MXS_MONITOR* monitor);
~MMMonitor();
MXS_MONITORED_SERVER *get_current_master();