From f8545a0b7f9dce39d477bb937662a0e2ace58536 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Mon, 7 Jan 2019 12:59:57 +0200 Subject: [PATCH] MXS-2219 Address review comments --- Documentation/Monitors/Clustrix-Monitor.md | 2 +- server/modules/monitor/clustrixmon/clustrixmonitor.cc | 2 +- server/modules/monitor/clustrixmon/clustrixmonitor.hh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/Monitors/Clustrix-Monitor.md b/Documentation/Monitors/Clustrix-Monitor.md index 4569b6046..06a2bc79e 100644 --- a/Documentation/Monitors/Clustrix-Monitor.md +++ b/Documentation/Monitors/Clustrix-Monitor.md @@ -35,7 +35,7 @@ For a list of optional parameters that all monitors support, read the ## Clustrix Monitor optional parameters -These are optional parameters specific to the Galera Monitor. +These are optional parameters specific to the Clustrix Monitor. ### `cluster_monitor_interval` diff --git a/server/modules/monitor/clustrixmon/clustrixmonitor.cc b/server/modules/monitor/clustrixmon/clustrixmonitor.cc index 9ef01c799..1c8690dda 100644 --- a/server/modules/monitor/clustrixmon/clustrixmonitor.cc +++ b/server/modules/monitor/clustrixmon/clustrixmonitor.cc @@ -52,7 +52,7 @@ bool ClustrixMonitor::configure(const MXS_CONFIG_PARAMETER* pParams) return true; } -void ClustrixMonitor::pre_tick() +void ClustrixMonitor::pre_loop() { m_http = mxb::http::get_async(m_health_urls); diff --git a/server/modules/monitor/clustrixmon/clustrixmonitor.hh b/server/modules/monitor/clustrixmon/clustrixmonitor.hh index e22489c5b..5db7499c9 100644 --- a/server/modules/monitor/clustrixmon/clustrixmonitor.hh +++ b/server/modules/monitor/clustrixmon/clustrixmonitor.hh @@ -50,7 +50,7 @@ public: private: ClustrixMonitor(MXS_MONITOR* pMonitor); - void pre_tick(); + void pre_loop() override; void tick();