Monitor json diagnostics printing cleanup

The 'events' and 'script' config values were defined for every monitor.
Removed the extra definitions and moved the variables to MXS_MONITOR.

MariaDBMonitor was printing config values a second time, they are
already printed by the caller.

Moved the events enum definition to the internal header since it's no longer
required by modules.

Added a default config setting "all" to 'events' to clarify that it enables
all events.
This commit is contained in:
Esa Korhonen
2018-08-08 17:14:03 +03:00
parent 6661680c4e
commit b9ec3f5130
12 changed files with 57 additions and 192 deletions

View File

@ -114,9 +114,6 @@ public:
protected:
MonitorInstance(MXS_MONITOR* pMonitor);
const std::string& script() const { return m_script; }
uint64_t events() const { return m_events; }
/**
* @brief Should the monitor shut down?
*
@ -215,8 +212,6 @@ private:
int32_t m_state; /**< The current state of the monitor. */
int32_t m_shutdown; /**< Non-zero if the monitor should shut down. */
bool m_checked; /**< Whether server access has been checked. */
std::string m_script; /**< Launchable script. */
uint64_t m_events; /**< Enabled monitor events. */
Semaphore m_semaphore; /**< Semaphore for synchronizing with monitor thread. */
int64_t m_loop_called; /**< When was the loop called the last time. */