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

MXS-2177 Move check_monitor_permissions() into class

Browse Source
This commit is contained in:
Esa Korhonen
2019-01-23 18:03:41 +02:00
parent ddaba28d78
commit 10dc0f53e0
14 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,12 +40,10 @@ AuroraMonitor* AuroraMonitor::create(const std::string& name, const std::string&
return new AuroraMonitor(name, module);
}
bool AuroraMonitor::has_sufficient_permissions() const
bool AuroraMonitor::has_sufficient_permissions()
{
return check_monitor_permissions(m_monitor,
"SELECT @@aurora_server_id, server_id FROM "
"information_schema.replica_host_status "
"WHERE session_id = 'MASTER_SESSION_ID'");
return test_permissions("SELECT @@aurora_server_id, server_id FROM "
"information_schema.replica_host_status WHERE session_id = 'MASTER_SESSION_ID'");
}
/**

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

@ -29,7 +29,7 @@ public:
static AuroraMonitor* create(const std::string& name, const std::string& module);
protected:
bool has_sufficient_permissions() const;
bool has_sufficient_permissions();
void update_server_status(MXS_MONITORED_SERVER* monitored_server);
private: