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

MonitorInstance::diagnostics_json() should return an empty object

Browse Source 
Some of the inheriting classes call the base class diagnostics_json
when constructing their own diagnostics data.
This commit is contained in:
Esa Korhonen
2018-08-10 17:28:41 +03:00
parent e5a90d63e1
commit ddc422b102
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/monitor.cc
View File

@ -2510,7 +2510,7 @@ void MonitorInstance::diagnostics(DCB* pDcb) const
json_t* MonitorInstance::diagnostics_json() const json_t* MonitorInstance::diagnostics_json() const
{ {
return NULL; return json_object();
} }
bool MonitorInstance::start(const MXS_CONFIG_PARAMETER* pParams) bool MonitorInstance::start(const MXS_CONFIG_PARAMETER* pParams)

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

@ -320,7 +320,7 @@ json_t* MariaDBMonitor::diagnostics_json() const
json_t* MariaDBMonitor::diagnostics_to_json() const json_t* MariaDBMonitor::diagnostics_to_json() const
{ {
json_t* rval = json_object(); json_t* rval = MonitorInstance::diagnostics_json();
json_object_set_new(rval, "monitor_id", json_integer(m_id)); json_object_set_new(rval, "monitor_id", json_integer(m_id));
if (!m_servers.empty()) if (!m_servers.empty())