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

MXS-2271 Monitor config name and instance name are parameters of createInstance()

Browse Source 
Also adds/moves some comments from previous entrypoints. Name and module
are now constant fields.
This commit is contained in:
Esa Korhonen
2019-01-21 15:51:53 +02:00
parent de970e579e
commit f6cec41dd8
19 changed files with 75 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/monitor/csmon/csmon.cc
View File

@ -71,7 +71,8 @@ int get_cs_version(MXS_MONITORED_SERVER* srv)
}
}
CsMonitor::CsMonitor()
CsMonitor::CsMonitor(const std::string& name, const std::string& module)
: MonitorWorkerSimple(name, module)
{
}
@ -80,9 +81,9 @@ CsMonitor::~CsMonitor()
}
// static
CsMonitor* CsMonitor::create()
CsMonitor* CsMonitor::create(const std::string& name, const std::string& module)
{
return new CsMonitor();
return new CsMonitor(name, module);
}
bool CsMonitor::has_sufficient_permissions() const

4
server/modules/monitor/csmon/csmon.hh
View File

@ -22,14 +22,14 @@ public:
CsMonitor& operator=(const CsMonitor&) = delete;
~CsMonitor();
static CsMonitor* create();
static CsMonitor* create(const std::string& name, const std::string& module);
protected:
bool has_sufficient_permissions() const;
void update_server_status(MXS_MONITORED_SERVER* monitored_server);
private:
CsMonitor();
CsMonitor(const std::string& name, const std::string& module);
bool configure(const MXS_CONFIG_PARAMETER* pParams) override;
SERVER* m_primary;