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

Updated server version added to the prompt and in the log files.

Browse Source 
See Bugzilla bug 376.
This commit is contained in:
Mark Riddoch
2014-02-05 11:29:20 +01:00
parent fb8212543a
commit fa79a121e6
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION Normal file
View File

@ -0,0 +1 @@
0.5.0

8
server/core/Makefile
View File

@ -63,7 +63,7 @@ HDRS= ../include/atomic.h ../include/buffer.h ../include/dcb.h \
../include/session.h ../include/spinlock.h ../include/thread.h \ ../include/session.h ../include/spinlock.h ../include/thread.h \
../include/modules.h ../include/poll.h ../include/config.h \ ../include/modules.h ../include/poll.h ../include/config.h \
../include/users.h ../include/hashtable.h ../include/gwbitmask.h \ ../include/users.h ../include/hashtable.h ../include/gwbitmask.h \
../include/adminusers.h ../include/adminusers.h ../include/version.h
OBJ=$(SRCS:.c=.o) OBJ=$(SRCS:.c=.o)
@ -89,6 +89,10 @@ maxpasswd: $(POBJS)
.c.o: .c.o:
$(CC) $(CFLAGS) $< -o $@ $(CC) $(CFLAGS) $< -o $@
../include/version.h: ../../VERSION
echo '#define MAXSCALE_VERSION "'`cat ../../VERSION`'"' > ../include/version.h
clean: clean:
rm -f $(OBJ) maxscale rm -f $(OBJ) maxscale
- rm *.so - rm *.so
@ -96,7 +100,7 @@ clean:
tags: tags:
ctags $(SRCS) $(HDRS) ctags $(SRCS) $(HDRS)
depend: depend: ../include/version.h
@rm -f depend.mk @rm -f depend.mk
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk

7
server/core/gateway.c
View File

@ -34,6 +34,7 @@
* 28/06/13 Vilho Raatikka Added necessary headers, example functions and * 28/06/13 Vilho Raatikka Added necessary headers, example functions and
* calls to log manager and to query classifier. * calls to log manager and to query classifier.
* Put example code behind SS_DEBUG macros. * Put example code behind SS_DEBUG macros.
* 05/02/14 Mark Riddoch Addition of version string
* *
* @endverbatim * @endverbatim
*/ */
@ -53,6 +54,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <mysql.h> #include <mysql.h>
#include <monitor.h> #include <monitor.h>
#include <version.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@ -313,7 +315,7 @@ static bool file_write_header(
*t = time(NULL); *t = time(NULL);
*tm = *localtime(t); *tm = *localtime(t);
header_buf1 = "\n\nSkySQL MaxScale\t"; header_buf1 = "\n\nSkySQL MaxScale " MAXSCALE_VERSION "\t";
header_buf2 = strdup(asctime(tm)); header_buf2 = strdup(asctime(tm));
if (header_buf2 == NULL) { if (header_buf2 == NULL) {
@ -1294,7 +1296,8 @@ int main(int argc, char **argv)
} }
LOGIF(LM, (skygw_log_write( LOGIF(LM, (skygw_log_write(
LOGFILE_MESSAGE, LOGFILE_MESSAGE,
"SkySQL MaxScale (C) SkySQL Ab 2013"))); "SkySQL MaxScale %s (C) SkySQL Ab 2013,2014",
MAXSCALE_VERSION)));
LOGIF(LM, (skygw_log_write( LOGIF(LM, (skygw_log_write(
LOGFILE_MESSAGE, LOGFILE_MESSAGE,
"MaxScale is running in process %i", "MaxScale is running in process %i",

4
server/modules/include/mysql_client_server_protocol.h
View File

@ -49,9 +49,9 @@
#include <router.h> #include <router.h>
#include <poll.h> #include <poll.h>
#include <users.h> #include <users.h>
#include <version.h>
#define GW_VERSION "0.1.0" #define GW_MYSQL_VERSION "MaxScale " MAXSCALE_VERSION
#define GW_MYSQL_VERSION "5.5.22-SKYSQL-" GW_VERSION
#define GW_MYSQL_LOOP_TIMEOUT 300000000 #define GW_MYSQL_LOOP_TIMEOUT 300000000
#define GW_MYSQL_READ 0 #define GW_MYSQL_READ 0
#define GW_MYSQL_WRITE 1 #define GW_MYSQL_WRITE 1