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

First step to refactoring monitors.

Browse Source
This commit is contained in:
Markus Makela
2015-03-10 12:24:23 +02:00
parent 1b91f776a3
commit c0d2a12990
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/config.c
View File

@ -2252,3 +2252,8 @@ void
config_disable_feedback_task(void) { config_disable_feedback_task(void) {
hktask_remove("send_feedback"); hktask_remove("send_feedback");
} }
unsigned long config_get_gateway_id()
{
return gateway.id;
}

1
server/include/config.h
View File

@ -140,4 +140,5 @@ bool config_get_valtarget(
void config_enable_feedback_task(void); void config_enable_feedback_task(void);
void config_disable_feedback_task(void); void config_disable_feedback_task(void);
unsigned long config_get_gateway_id(void);
#endif #endif

3
server/include/monitor.h
View File

@ -73,9 +73,12 @@ typedef struct {
void (*unregisterServer)(void *, SERVER *); void (*unregisterServer)(void *, SERVER *);
void (*defaultUser)(void *, char *, char *); void (*defaultUser)(void *, char *, char *);
void (*diagnostics)(DCB *, void *); void (*diagnostics)(DCB *, void *);
void (*setInterval)(void *, size_t); void (*setInterval)(void *, size_t);
void (*setNetworkTimeout)(void *, int, int); void (*setNetworkTimeout)(void *, int, int);
void (*defaultId)(void *, unsigned long); void (*defaultId)(void *, unsigned long);
void (*replicationHeartbeat)(void *, int); void (*replicationHeartbeat)(void *, int);
void (*detectStaleMaster)(void *, int); void (*detectStaleMaster)(void *, int);
void (*disableMasterFailback)(void *, int); void (*disableMasterFailback)(void *, int);

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

@ -64,6 +64,8 @@
#include <dcb.h> #include <dcb.h>
#include <modinfo.h> #include <modinfo.h>
#include "config.h"
/** Defined in log_manager.cc */ /** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask; extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[]; extern size_t log_ses_count[];
@ -164,7 +166,7 @@ GetModuleObject()
* @return A handle to use when interacting with the monitor * @return A handle to use when interacting with the monitor
*/ */
static void * static void *
startMonitor(void *arg) startMonitor(void *arg,CONFIG_PARAMETER param)
{ {
MYSQL_MONITOR *handle; MYSQL_MONITOR *handle;