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

Fixed some misaligned brackets.

Browse Source
This commit is contained in:
Markus Makela
2015-11-16 21:00:22 +02:00
parent 6846b0b6b6
commit 5d4fe65b19
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/modules/monitor/galeramon.c
View File

@ -48,7 +48,8 @@ static void monitorMain(void *);
static char *version_str = "V2.0.0"; static char *version_str = "V2.0.0";
MODULE_INFO info = { MODULE_INFO info =
{
MODULE_API_MONITOR, MODULE_API_MONITOR,
MODULE_GA, MODULE_GA,
MONITOR_VERSION, MONITOR_VERSION,
@ -63,7 +64,8 @@ static MONITOR_SERVERS *set_cluster_master(MONITOR_SERVERS *, MONITOR_SERVERS *,
static void disableMasterFailback(void *, int); static void disableMasterFailback(void *, int);
bool isGaleraEvent(monitor_event_t event); bool isGaleraEvent(monitor_event_t event);
static MONITOR_OBJECT MyObject = { static MONITOR_OBJECT MyObject =
{
startMonitor, startMonitor,
stopMonitor, stopMonitor,
diagnostics diagnostics
@ -758,7 +760,8 @@ availableWhenDonor(void *arg, int disable)
memcpy(&handle->availableWhenDonor, &disable, sizeof(int)); memcpy(&handle->availableWhenDonor, &disable, sizeof(int));
} }
static monitor_event_t galera_events[] = { static monitor_event_t galera_events[] =
{
MASTER_DOWN_EVENT, MASTER_DOWN_EVENT,
MASTER_UP_EVENT, MASTER_UP_EVENT,
SLAVE_DOWN_EVENT, SLAVE_DOWN_EVENT,

3
server/modules/monitor/mmmon.c
View File

@ -749,7 +749,8 @@ static MONITOR_SERVERS *get_current_master(MONITOR *mon)
} }
static monitor_event_t mysql_events[] = { static monitor_event_t mysql_events[] =
{
MASTER_DOWN_EVENT, MASTER_DOWN_EVENT,
MASTER_UP_EVENT, MASTER_UP_EVENT,
SLAVE_DOWN_EVENT, SLAVE_DOWN_EVENT,

9
server/modules/monitor/mysql_mon.c
View File

@ -60,7 +60,8 @@ static void monitorMain(void *);
static char *version_str = "V1.4.0"; static char *version_str = "V1.4.0";
MODULE_INFO info = { MODULE_INFO info =
{
MODULE_API_MONITOR, MODULE_API_MONITOR,
MODULE_GA, MODULE_GA,
MONITOR_VERSION, MONITOR_VERSION,
@ -82,7 +83,8 @@ void check_maxscale_schema_replication(MONITOR *monitor);
static bool report_version_err = true; static bool report_version_err = true;
static const char* hb_table_name = "maxscale_schema.replication_heartbeat"; static const char* hb_table_name = "maxscale_schema.replication_heartbeat";
static MONITOR_OBJECT MyObject = { static MONITOR_OBJECT MyObject =
{
startMonitor, startMonitor,
stopMonitor, stopMonitor,
diagnostics diagnostics
@ -1501,7 +1503,8 @@ static int add_slave_to_master(long *slaves_list, int list_size, long node_id)
return 0; return 0;
} }
static monitor_event_t mysql_events[] = { static monitor_event_t mysql_events[] =
{
MASTER_DOWN_EVENT, MASTER_DOWN_EVENT,
MASTER_UP_EVENT, MASTER_UP_EVENT,
SLAVE_DOWN_EVENT, SLAVE_DOWN_EVENT,

11
server/modules/monitor/ndbclustermon.c
View File

@ -37,7 +37,8 @@ static void monitorMain(void *);
static char *version_str = "V2.1.0"; static char *version_str = "V2.1.0";
MODULE_INFO info = { MODULE_INFO info =
{
MODULE_API_MONITOR, MODULE_API_MONITOR,
MODULE_BETA_RELEASE, MODULE_BETA_RELEASE,
MONITOR_VERSION, MONITOR_VERSION,
@ -49,7 +50,8 @@ static void stopMonitor(void *);
static void diagnostics(DCB *, void *); static void diagnostics(DCB *, void *);
bool isNdbEvent(monitor_event_t event); bool isNdbEvent(monitor_event_t event);
static MONITOR_OBJECT MyObject = { static MONITOR_OBJECT MyObject =
{
startMonitor, startMonitor,
stopMonitor, stopMonitor,
diagnostics diagnostics
@ -436,7 +438,8 @@ monitorMain(void *arg)
} }
static monitor_event_t ndb_events[] = { static monitor_event_t ndb_events[] =
{
MASTER_DOWN_EVENT, MASTER_DOWN_EVENT,
MASTER_UP_EVENT, MASTER_UP_EVENT,
SLAVE_DOWN_EVENT, SLAVE_DOWN_EVENT,
@ -465,7 +468,9 @@ bool isNdbEvent(monitor_event_t event)
for (i = 0; ndb_events[i] != MAX_MONITOR_EVENT; i++) for (i = 0; ndb_events[i] != MAX_MONITOR_EVENT; i++)
{ {
if (event == ndb_events[i]) if (event == ndb_events[i])
{
return true; return true;
} }
}
return false; return false;
} }