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

Updates for new logging definitions

Browse Source
This commit is contained in:
Mark Riddoch
2014-12-04 16:56:33 +00:00
parent 1baff3dfbb
commit 36aea7454f
7 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/filter.c
View File

@ -332,8 +332,7 @@ DOWNSTREAM *me;
if ((filter->obj = load_module(filter->module, if ((filter->obj = load_module(filter->module,
MODULE_FILTER)) == NULL) MODULE_FILTER)) == NULL)
{ {
me = NULL; return NULL:
goto retblock;
} }
} }
@ -342,8 +341,7 @@ DOWNSTREAM *me;
if ((filter->filter = (filter->obj->createInstance)(filter->options, if ((filter->filter = (filter->obj->createInstance)(filter->options,
filter->parameters)) == NULL) filter->parameters)) == NULL)
{ {
me = NULL; return NULL;
goto retblock;
} }
} }
if ((me = (DOWNSTREAM *)calloc(1, sizeof(DOWNSTREAM))) == NULL) if ((me = (DOWNSTREAM *)calloc(1, sizeof(DOWNSTREAM))) == NULL)
@ -355,7 +353,7 @@ DOWNSTREAM *me;
errno, errno,
strerror(errno)))); strerror(errno))));
goto retblock; return NULL;
} }
me->instance = filter->filter; me->instance = filter->filter;
me->routeQuery = (void *)(filter->obj->routeQuery); me->routeQuery = (void *)(filter->obj->routeQuery);
@ -363,12 +361,10 @@ DOWNSTREAM *me;
if ((me->session=filter->obj->newSession(me->instance, session)) == NULL) if ((me->session=filter->obj->newSession(me->instance, session)) == NULL)
{ {
free(me); free(me);
me = NULL; return NULL;
goto retblock;
} }
filter->obj->setDownstream(me->instance, me->session, downstream); filter->obj->setDownstream(me->instance, me->session, downstream);
retblock:
return me; return me;
} }

1
server/modules/routing/CMakeLists.txt
View File

@ -19,4 +19,5 @@ target_link_libraries(cli log_manager utils)
install(TARGETS cli DESTINATION modules) install(TARGETS cli DESTINATION modules)
add_subdirectory(readwritesplit) add_subdirectory(readwritesplit)
add_subdirectory(binlog)

2
server/modules/routing/binlog/blr.c
View File

@ -59,6 +59,8 @@
#include <mysql_client_server_protocol.h> #include <mysql_client_server_protocol.h>
extern int lm_enabled_logfiles_bitmask; extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static char *version_str = "V1.0.6"; static char *version_str = "V1.0.6";

2
server/modules/routing/binlog/blr_cache.c
View File

@ -54,6 +54,8 @@
extern int lm_enabled_logfiles_bitmask; extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/** /**

2
server/modules/routing/binlog/blr_file.c
View File

@ -51,6 +51,8 @@
#include <log_manager.h> #include <log_manager.h>
extern int lm_enabled_logfiles_bitmask; extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static void blr_file_create(ROUTER_INSTANCE *router, char *file); static void blr_file_create(ROUTER_INSTANCE *router, char *file);

2
server/modules/routing/binlog/blr_master.c
View File

@ -63,6 +63,8 @@
extern int lm_enabled_logfiles_bitmask; extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static GWBUF *blr_make_query(char *statement); static GWBUF *blr_make_query(char *statement);
static GWBUF *blr_make_registration(ROUTER_INSTANCE *router); static GWBUF *blr_make_registration(ROUTER_INSTANCE *router);

2
server/modules/routing/binlog/blr_slave.c
View File

@ -67,6 +67,8 @@ int blr_slave_callback(DCB *dcb, DCB_REASON reason, void *data);
static int blr_slave_fake_rotate(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave); static int blr_slave_fake_rotate(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave);
extern int lm_enabled_logfiles_bitmask; extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/** /**
* Process a request packet from the slave server. * Process a request packet from the slave server.