Rename MODULE_INFO to MXS_MODULE
The MODULE_INFO is now the main object which is used by modules to convey information to the MaxScale core. The MXS_MODULE name is more apt as it now contains the actual module definition. The old MODULES structure was moved into load_utils.c as an internal implementation and was renamed so that it is not confused with the new MODULE structure.
This commit is contained in:
@ -344,7 +344,7 @@ diagnostics(DCB *dcb, const MONITOR *mon)
|
||||
*
|
||||
* @return The module object
|
||||
*/
|
||||
MODULE_INFO* MXS_CREATE_MODULE()
|
||||
MXS_MODULE* MXS_CREATE_MODULE()
|
||||
{
|
||||
static MONITOR_OBJECT MyObject =
|
||||
{
|
||||
@ -353,10 +353,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
|
||||
diagnostics
|
||||
};
|
||||
|
||||
static MODULE_INFO info =
|
||||
static MXS_MODULE info =
|
||||
{
|
||||
MODULE_API_MONITOR,
|
||||
MODULE_BETA_RELEASE,
|
||||
MXS_MODULE_API_MONITOR,
|
||||
MXS_MODULE_BETA_RELEASE,
|
||||
MONITOR_VERSION,
|
||||
"Aurora monitor",
|
||||
"V1.0.0",
|
||||
|
@ -59,7 +59,7 @@ bool isGaleraEvent(monitor_event_t event);
|
||||
*
|
||||
* @return The module object
|
||||
*/
|
||||
MODULE_INFO* MXS_CREATE_MODULE()
|
||||
MXS_MODULE* MXS_CREATE_MODULE()
|
||||
{
|
||||
MXS_NOTICE("Initialise the MySQL Galera Monitor module.");
|
||||
|
||||
@ -70,10 +70,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
|
||||
diagnostics
|
||||
};
|
||||
|
||||
static MODULE_INFO info =
|
||||
static MXS_MODULE info =
|
||||
{
|
||||
MODULE_API_MONITOR,
|
||||
MODULE_GA,
|
||||
MXS_MODULE_API_MONITOR,
|
||||
MXS_MODULE_GA,
|
||||
MONITOR_VERSION,
|
||||
"A Galera cluster monitor",
|
||||
"V2.0.0",
|
||||
|
@ -35,10 +35,10 @@ static void monitorMain(void *);
|
||||
* lint directives.
|
||||
*/
|
||||
/*lint -e14 */
|
||||
MODULE_INFO info =
|
||||
MXS_MODULE info =
|
||||
{
|
||||
MODULE_API_MONITOR,
|
||||
MODULE_BETA_RELEASE,
|
||||
MXS_MODULE_API_MONITOR,
|
||||
MXS_MODULE_BETA_RELEASE,
|
||||
MONITOR_VERSION,
|
||||
"A Multi-Master Multi Master monitor",
|
||||
"V1.1.1"
|
||||
@ -60,7 +60,7 @@ static bool isMySQLEvent(monitor_event_t event);
|
||||
*
|
||||
* @return The module object
|
||||
*/
|
||||
MODULE_INFO* MXS_CREATE_MODULE()
|
||||
MXS_MODULE* MXS_CREATE_MODULE()
|
||||
{
|
||||
MXS_NOTICE("Initialise the Multi-Master Monitor module.");
|
||||
|
||||
@ -71,10 +71,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
|
||||
diagnostics
|
||||
};
|
||||
|
||||
static MODULE_INFO info =
|
||||
static MXS_MODULE info =
|
||||
{
|
||||
MODULE_API_MONITOR,
|
||||
MODULE_BETA_RELEASE,
|
||||
MXS_MODULE_API_MONITOR,
|
||||
MXS_MODULE_BETA_RELEASE,
|
||||
MONITOR_VERSION,
|
||||
"A Multi-Master Multi Master monitor",
|
||||
"V1.1.1",
|
||||
|
@ -94,7 +94,7 @@ static const char* hb_table_name = "maxscale_schema.replication_heartbeat";
|
||||
*
|
||||
* @return The module object
|
||||
*/
|
||||
MODULE_INFO* MXS_CREATE_MODULE()
|
||||
MXS_MODULE* MXS_CREATE_MODULE()
|
||||
{
|
||||
MXS_NOTICE("Initialise the MySQL Monitor module.");
|
||||
|
||||
@ -105,10 +105,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
|
||||
diagnostics
|
||||
};
|
||||
|
||||
static MODULE_INFO info =
|
||||
static MXS_MODULE info =
|
||||
{
|
||||
MODULE_API_MONITOR,
|
||||
MODULE_GA,
|
||||
MXS_MODULE_API_MONITOR,
|
||||
MXS_MODULE_GA,
|
||||
MONITOR_VERSION,
|
||||
"A MySQL Master/Slave replication monitor",
|
||||
"V1.5.0",
|
||||
|
@ -53,7 +53,7 @@ bool isNdbEvent(monitor_event_t event);
|
||||
*
|
||||
* @return The module object
|
||||
*/
|
||||
MODULE_INFO* MXS_CREATE_MODULE()
|
||||
MXS_MODULE* MXS_CREATE_MODULE()
|
||||
{
|
||||
MXS_NOTICE("Initialise the MySQL Cluster Monitor module.");
|
||||
|
||||
@ -64,10 +64,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
|
||||
diagnostics
|
||||
};
|
||||
|
||||
static MODULE_INFO info =
|
||||
static MXS_MODULE info =
|
||||
{
|
||||
MODULE_API_MONITOR,
|
||||
MODULE_BETA_RELEASE,
|
||||
MXS_MODULE_API_MONITOR,
|
||||
MXS_MODULE_BETA_RELEASE,
|
||||
MONITOR_VERSION,
|
||||
"A MySQL cluster SQL node monitor",
|
||||
"V2.1.0",
|
||||
|
Reference in New Issue
Block a user