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

New monitor added to Makefile

Browse Source 
New monitor added to Makefile
This commit is contained in:
MassimilianoPinto
2014-07-28 09:53:42 +02:00
parent cbefda6517
commit e91045d311
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/monitor/Makefile
View File

@ -17,6 +17,7 @@
# Revision History # Revision History
# Date Who Description # Date Who Description
# 08/07/13 Mark Riddoch Initial implementation # 08/07/13 Mark Riddoch Initial implementation
# 28/07/14 Massimiliano Pinto new monitor ndbcluster added
include ../../../build_gateway.inc include ../../../build_gateway.inc
LOGPATH := $(ROOT_PATH)/log_manager LOGPATH := $(ROOT_PATH)/log_manager
@ -36,11 +37,13 @@ MYSQLSRCS=mysql_mon.c
MYSQLOBJ=$(MYSQLSRCS:.c=.o) MYSQLOBJ=$(MYSQLSRCS:.c=.o)
GALERASRCS=galera_mon.c GALERASRCS=galera_mon.c
GALERAOBJ=$(GALERASRCS:.c=.o) GALERAOBJ=$(GALERASRCS:.c=.o)
SRCS=$(MYSQLSRCS) NDBCLUSTERSRCS=ndbcluster_mon.c
NDBCLUSTEROBJ=$(NDBCLUSTERSRCS:.c=.o)
SRCS=$(MYSQLSRCS) $(GALERASRCS) $(NDBCLUSTERSRCS)
OBJ=$(SRCS:.c=.o) OBJ=$(SRCS:.c=.o)
LIBS=$(UTILSPATH)/skygw_utils.o -llog_manager \ LIBS=$(UTILSPATH)/skygw_utils.o -llog_manager \
-L$(EMBEDDED_LIB) -lmysqld -L$(EMBEDDED_LIB) -lmysqld
MODULES=libmysqlmon.so libgaleramon.so MODULES=libmysqlmon.so libgaleramon.so libndbclustermon.so
all: $(MODULES) all: $(MODULES)
@ -51,6 +54,9 @@ libmysqlmon.so: $(MYSQLOBJ)
libgaleramon.so: $(GALERAOBJ) libgaleramon.so: $(GALERAOBJ)
$(CC) $(LDFLAGS) $(GALERAOBJ) $(LIBS) -o $@ $(CC) $(LDFLAGS) $(GALERAOBJ) $(LIBS) -o $@
libndbclustermon.so: $(NDBCLUSTEROBJ)
$(CC) $(LDFLAGS) $(NDBCLUSTEROBJ) $(LIBS) -o $@
.c.o: .c.o:
$(CC) $(CFLAGS) $< -o $@ $(CC) $(CFLAGS) $< -o $@

1
server/modules/monitor/ndbcluster_mon.c
View File

@ -385,6 +385,7 @@ char *server_string;
database->server->depth = 0; database->server->depth = 0;
} else { } else {
server_clear_status(database->server, SERVER_JOINED); server_clear_status(database->server, SERVER_JOINED);
database->server->depth = -1;
} }
} }