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

2
include/maxscale/monitor.hh
View File

@ -134,7 +134,7 @@ public:
static void destroyInstance(MXS_MONITOR_INSTANCE* pInstance)
{
MXS_EXCEPTION_GUARD(static_cast<MonitorInstance*>(pInstance)->destroy());
MXS_EXCEPTION_GUARD(delete static_cast<MonitorInstance*>(pInstance));
}
static bool startMonitor(MXS_MONITOR_INSTANCE* pInstance,

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

@ -40,11 +40,6 @@ AuroraMonitor* AuroraMonitor::create(MXS_MONITOR* monitor)
return new AuroraMonitor(monitor);
}
void AuroraMonitor::destroy()
{
delete this;
}
/**
* @brief Update the status of a server
*

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

@ -26,14 +26,13 @@ public:
AuroraMonitor(const AuroraMonitor&) = delete;
AuroraMonitor& operator = (const AuroraMonitor&) = delete;
~AuroraMonitor();
static AuroraMonitor* create(MXS_MONITOR* monitor);
void destroy();
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;
private:
AuroraMonitor(MXS_MONITOR* monitor);
~AuroraMonitor();
void update_server_status(MXS_MONITORED_SERVER* monitored_server);

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,

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

@ -40,11 +40,6 @@ GRMon* GRMon::create(MXS_MONITOR* monitor)
return new GRMon(monitor);
}
void GRMon::destroy()
{
delete this;
}
bool GRMon::has_sufficient_permissions() const
{
return true;

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

@ -26,14 +26,13 @@ public:
GRMon(const GRMon&) = delete;
GRMon& operator&(const GRMon&) = delete;
~GRMon();
static GRMon* create(MXS_MONITOR* monitor);
void destroy();
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;
private:
GRMon(MXS_MONITOR* monitor);
~GRMon();
void update_server_status(MXS_MONITORED_SERVER* monitored_server);

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

@ -173,11 +173,6 @@ bool MariaDBMonitor::start(const MXS_CONFIG_PARAMETER* params)
return !error;
}
void MariaDBMonitor::destroy()
{
delete this;
}
/**
* Load config parameters
*

8
server/modules/monitor/mariadbmon/mariadbmon.hh
View File

@ -42,6 +42,8 @@ private:
public:
// TODO: Once done refactoring, see which of these can be moved to private.
~MariaDBMonitor();
/**
* Print diagnostics.
*
@ -78,11 +80,6 @@ public:
*/
bool start(const MXS_CONFIG_PARAMETER* params);
/**
* Destroyes aka deletes the instance.
*/
void destroy();
/**
* Stop the monitor. Waits until monitor has stopped.
*/
@ -171,7 +168,6 @@ private:
// Base methods
MariaDBMonitor(MXS_MONITOR* monitor_base);
~MariaDBMonitor();
void reset_server_info();
void clear_server_info();
bool load_config_params(const MXS_CONFIG_PARAMETER* params);

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();

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);