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

Fixed luafilter build failures

Browse Source 
The luafilter referred to the old session client DCB name and linked against
log_manager and utils but not maxscale-common.
This commit is contained in:
Markus Makela
2016-03-08 10:34:14 +02:00
parent 3973ba36be
commit fd34cd4014
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/filter/CMakeLists.txt
View File

@ -41,7 +41,7 @@ if(BUILD_LUAFILTER)
if(LUA_FOUND) if(LUA_FOUND)
include_directories(${LUA_INCLUDE_DIR}) include_directories(${LUA_INCLUDE_DIR})
add_library(luafilter SHARED luafilter.c) add_library(luafilter SHARED luafilter.c)
target_link_libraries(luafilter log_manager utils ${LUA_LIBRARIES}) target_link_libraries(luafilter maxscale-common ${LUA_LIBRARIES})
install(TARGETS luafilter DESTINATION ${MAXSCALE_LIBDIR}) install(TARGETS luafilter DESTINATION ${MAXSCALE_LIBDIR})
else() else()
message(STATUS "Lua was not found, luafilter will not be built.") message(STATUS "Lua was not found, luafilter will not be built.")

2
server/modules/filter/luafilter.c
View File

@ -461,7 +461,7 @@ static int routeQuery(FILTER *instance, void *session, GWBUF *queue)
{ {
LUA_SESSION *my_session = (LUA_SESSION *) session; LUA_SESSION *my_session = (LUA_SESSION *) session;
LUA_INSTANCE *my_instance = (LUA_INSTANCE *) instance; LUA_INSTANCE *my_instance = (LUA_INSTANCE *) instance;
DCB* dcb = my_session->session->client; DCB* dcb = my_session->session->client_dcb;
char *fullquery = NULL, *ptr; char *fullquery = NULL, *ptr;
bool route = true; bool route = true;
GWBUF* forward = queue; GWBUF* forward = queue;