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

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

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

@ -26,8 +26,8 @@ public:
NDBCMonitor(const NDBCMonitor&) = delete;
NDBCMonitor& operator = (const NDBCMonitor&) = delete;
~NDBCMonitor();
static NDBCMonitor* create(MXS_MONITOR* monitor);
void destroy();
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;
@ -35,7 +35,6 @@ private:
unsigned long m_id; /**< Monitor ID */
NDBCMonitor(MXS_MONITOR* monitor);
~NDBCMonitor();
void update_server_status(MXS_MONITORED_SERVER* monitored_server);