MXS-2271 Move journal_max_age inside settings container

This commit is contained in:
Esa Korhonen
2019-01-28 18:24:04 +02:00
parent ce9b49d8d5
commit 03411e825d
7 changed files with 27 additions and 23 deletions

View File

@ -288,6 +288,8 @@ public:
void set_script_timeout(int value);
void monitor_set_journal_max_age(time_t value);
/**
* Create a list of running servers
*
@ -317,8 +319,6 @@ public:
MXS_CONFIG_PARAMETER* parameters = nullptr; /**< Configuration parameters */
std::vector<MXS_MONITORED_SERVER*> m_servers; /**< Monitored servers */
time_t journal_max_age; /**< Maximum age of journal file */
protected:
/**
@ -350,6 +350,8 @@ protected:
int script_timeout {0}; /**< Timeout in seconds for the monitor scripts */
uint64_t events {0}; /**< Bitfield of events which trigger the script */
time_t journal_max_age {0}; /**< Maximum age of journal file */
SERVER::DiskSpaceLimits disk_space_limits; /**< Disk space thresholds */
/**
* How often should a disk space check be made at most, in milliseconds. Negative values imply
@ -391,6 +393,8 @@ private:
* @return Return value of the executed script or -1 on error.
*/
int launch_command(MXS_MONITORED_SERVER* ptr, EXTERNCMD* cmd);
bool journal_is_stale();
};
/**