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

Further cleanup of monitor headers

Browse Source
This commit is contained in:
Esa Korhonen
2017-01-20 14:31:16 +02:00
parent 7723641687
commit 9430da94b9
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/maxscale/monitor.h
View File

@ -22,11 +22,6 @@
#include <maxscale/config.h> #include <maxscale/config.h>
#include <maxscale/dcb.h> #include <maxscale/dcb.h>
#include <maxscale/externcmd.h>
#include <maxscale/log_manager.h>
#include <maxscale/modinfo.h>
#include <maxscale/resultset.h>
#include <maxscale/secrets.h>
#include <maxscale/server.h> #include <maxscale/server.h>
MXS_BEGIN_DECLS MXS_BEGIN_DECLS

3
server/core/config.c
View File

@ -45,8 +45,10 @@
* @endverbatim * @endverbatim
*/ */
#include <maxscale/config.h> #include <maxscale/config.h>
#include <ctype.h> #include <ctype.h>
#include <ftw.h> #include <ftw.h>
#include <fcntl.h>
#include <glob.h> #include <glob.h>
#include <net/if.h> #include <net/if.h>
#include <stdio.h> #include <stdio.h>
@ -54,6 +56,7 @@
#include <string.h> #include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <ini.h> #include <ini.h>
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxscale/housekeeper.h> #include <maxscale/housekeeper.h>
#include <maxscale/limits.h> #include <maxscale/limits.h>

22
server/core/maxscale/monitor.h
View File

@ -38,13 +38,13 @@ typedef enum
MONITOR_WRITE_TIMEOUT = 2 MONITOR_WRITE_TIMEOUT = 2
} monitor_timeouts_t; } monitor_timeouts_t;
extern MXS_MONITOR *monitor_alloc(char *, char *); MXS_MONITOR *monitor_alloc(char *, char *);
extern void monitor_free(MXS_MONITOR *); void monitor_free(MXS_MONITOR *);
void monitorStart(MXS_MONITOR *, void*); void monitorStart(MXS_MONITOR *, void*);
void monitorStop(MXS_MONITOR *); void monitorStop(MXS_MONITOR *);
extern void monitorStopAll(); void monitorStopAll();
extern void monitorStartAll(); void monitorStartAll();
MXS_MONITOR *monitor_find(const char *); MXS_MONITOR *monitor_find(const char *);
@ -54,14 +54,14 @@ void monitorShowAll(DCB *);
void monitorList(DCB *); void monitorList(DCB *);
RESULTSET *monitorGetList(); RESULTSET *monitorGetList();
extern bool monitorAddServer(MXS_MONITOR *mon, SERVER *server); bool monitorAddServer(MXS_MONITOR *mon, SERVER *server);
extern void monitorRemoveServer(MXS_MONITOR *mon, SERVER *server); void monitorRemoveServer(MXS_MONITOR *mon, SERVER *server);
extern void monitorAddUser(MXS_MONITOR *, char *, char *); void monitorAddUser(MXS_MONITOR *, char *, char *);
extern void monitorAddParameters(MXS_MONITOR *monitor, CONFIG_PARAMETER *params); void monitorAddParameters(MXS_MONITOR *monitor, CONFIG_PARAMETER *params);
extern bool monitorRemoveParameter(MXS_MONITOR *monitor, const char *key); bool monitorRemoveParameter(MXS_MONITOR *monitor, const char *key);
extern void monitorSetInterval (MXS_MONITOR *, unsigned long); void monitorSetInterval (MXS_MONITOR *, unsigned long);
extern bool monitorSetNetworkTimeout(MXS_MONITOR *, int, int); bool monitorSetNetworkTimeout(MXS_MONITOR *, int, int);
/** /**
* @brief Serialize the servers of a monitor to a file * @brief Serialize the servers of a monitor to a file